diff --git a/.ci/daint.cscs.ch/ocl.build.sh b/.ci/daint.cscs.ch/ocl.build.sh
index f1f0fa4c105..0868909a288 100755
--- a/.ci/daint.cscs.ch/ocl.build.sh
+++ b/.ci/daint.cscs.ch/ocl.build.sh
@@ -35,7 +35,7 @@ if [ ! -d "${HOME}/libxsmm" ]; then
 fi
 cd "${HOME}/libxsmm"
 git fetch
-git checkout d009b33e8742a93c9e1549323587fb6197451294
+git checkout 6e6e718566679c73e248902e68f02683feca1885
 make -j
 cd ..
 
diff --git a/tools/docker/Dockerfile.build-env-ubuntu b/tools/docker/Dockerfile.build-env-ubuntu
index 73c935dec18..ae4cd984f75 100644
--- a/tools/docker/Dockerfile.build-env-ubuntu
+++ b/tools/docker/Dockerfile.build-env-ubuntu
@@ -55,12 +55,12 @@ RUN set -ex ; \
         git-archive-all \
         ;
 
-ARG libxsmm_version=1.17
+ARG libxsmm_version=6e6e718566679c73e248902e68f02683feca1885
 
 RUN set -ex ; \
-    curl -LsS https://github.com/hfp/libxsmm/archive/${libxsmm_version}.tar.gz | tar -xz -C /opt ; \
+    curl -LsS https://github.com/libxsmm/libxsmm/archive/${libxsmm_version}.tar.gz | tar -xz -C /opt ; \
     ln -s libxsmm-${libxsmm_version} /opt/libxsmm ; \
-    make -j -C /opt/libxsmm MALLOC=0
+    make -j -C /opt/libxsmm WRAP=0
 
 ENV PKG_CONFIG_PATH="/opt/libxsmm/lib:${PKG_CONFIG_PATH}"
 
diff --git a/tools/docker/Dockerfile.build-env-ubuntu-cuda b/tools/docker/Dockerfile.build-env-ubuntu-cuda
index bdcc7bc109d..f4da2e962cb 100644
--- a/tools/docker/Dockerfile.build-env-ubuntu-cuda
+++ b/tools/docker/Dockerfile.build-env-ubuntu-cuda
@@ -46,12 +46,12 @@ RUN set -ex ; \
         git-archive-all \
         ;
 
-ARG libxsmm_version=1.17
+ARG libxsmm_version=6e6e718566679c73e248902e68f02683feca1885
 
 RUN set -ex ; \
-    curl -LsS https://github.com/hfp/libxsmm/archive/${libxsmm_version}.tar.gz | tar -xz -C /opt ; \
+    curl -LsS https://github.com/libxsmm/libxsmm/archive/${libxsmm_version}.tar.gz | tar -xz -C /opt ; \
     ln -s libxsmm-${libxsmm_version} /opt/libxsmm ; \
-    make -j -C /opt/libxsmm MALLOC=0
+    make -j -C /opt/libxsmm WRAP=0
 
 ENV PKG_CONFIG_PATH="/opt/libxsmm/lib:${PKG_CONFIG_PATH}"