diff --git a/bsp_hosted/Dockerfile b/bsp_hosted/Dockerfile
index dccf909a..0459017f 100644
--- a/bsp_hosted/Dockerfile
+++ b/bsp_hosted/Dockerfile
@@ -8,6 +8,8 @@ WORKDIR /usr/src/app
 COPY . .
 
 RUN set -ex; \
+    git submodule init; \
+    git submodule update; \
     rm -rf build-hosted; \
     mkdir build-hosted; \
     cd build-hosted; \
diff --git a/bsp_q7s/Dockerfile b/bsp_q7s/Dockerfile
index 73bdd069..b39bbacb 100644
--- a/bsp_q7s/Dockerfile
+++ b/bsp_q7s/Dockerfile
@@ -5,11 +5,11 @@ RUN apt-get update && apt-get install -y curl cmake g++
 
 # Q7S root filesystem, required for cross-compilation
 RUN mkdir -p /usr/rootfs; \
-    curl https://eive-cloud.irs.uni-stuttgart.de/index.php/s/agnJGYeRf6fw2ci/download/cortexa9hf-neon-xiphos-linux-gnueabi.tar.gz \
+    curl https://eive-cloud.irs.uni-stuttgart.de/index.php/s/dnfMy9kGpgynN6J/download/cortexa9hf-neon-xiphos-linux-gnueabi.tar.gz \
     | tar xvz -C /usr/rootfs
 # Q7S C++ cross-compiler
 RUN mkdir -p /usr/tools; \
-    curl https://eive-cloud.irs.uni-stuttgart.de/index.php/s/2Fp2ag6NGnbtAsK/download/gcc-arm-linux-gnueabi.tar.gz \
+    curl https://eive-cloud.irs.uni-stuttgart.de/index.php/s/RMsbHydJc6PSqcz/download/gcc-arm-linux-gnueabi.tar.gz \
     | tar xvz -C /usr/tools
 
 # RUN apk add cmake make g++
@@ -22,6 +22,8 @@ WORKDIR /usr/src/app
 COPY . .
 
 RUN set -ex; \
+    git submodule init; \
+    git submodule update; \
     rm -rf build-q7s; \
     mkdir build-q7s; \
     cd build-q7s; \