diff --git a/bsp_q7s/Dockerfile b/bsp_q7s/Dockerfile
index 8cb309d6..652e2fac 100644
--- a/bsp_q7s/Dockerfile
+++ b/bsp_q7s/Dockerfile
@@ -1,22 +1,32 @@
 FROM ubuntu:latest
 # FROM alpine:latest
 
-RUN apt-get update && apt-get install -y cmake g++
+RUN apt-get update && apt-get install -y curl cmake g++
 
-RUN wget https://eive-cloud.irs.uni-stuttgart.de/index.php/s/aBjpbMAFCEP7prF/download/cortexa9hf-neon-xiphos-linux-gnueabi.tar.gz /usr/rootfs
-RUN wget https://eive-cloud.irs.uni-stuttgart.de/index.php/s/5bDHLF4spqn2zJT/download/gcc-arm-linux-gnueabi.tar.gz usr/tools
+# Q7S root filesystem, required for cross-compilation
+RUN mkdir -p /usr/rootfs; \
+    curl https://eive-cloud.irs.uni-stuttgart.de/index.php/s/aBjpbMAFCEP7prF/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/5bDHLF4spqn2zJT/download/gcc-arm-linux-gnueabi.tar.gz usr/tools \
+    | tar xvz -C /usr/tools
 
 # RUN apk add cmake make g++
 
+# Required for cmake build
+ENV Q7S_SYSROOT="/usr/rootfs/cortexa9hf-neon-xiphos-linux-gnueabi"
+ENV PATH=$PATH:"/usr/tools/gcc-arm-linux-gnueabi/bin"
+
 WORKDIR /usr/src/app
 COPY . .
 
 RUN set -ex; \
-    rm -rf build-hosted; \
-    mkdir build-hosted; \
-    cd build-hosted; \
-    cmake -DCMAKE_BUILD_TYPE=Release -DOS_FSFW=linux ..;
+    rm -rf build-q7s; \
+    mkdir build-q7s; \
+    cd build-q7s; \
+    cmake -DCMAKE_BUILD_TYPE=Release -DOS_FSFW=linux -DTGT_BSP="arm/q7s" ..;
 
-# ENTRYPOINT ["cmake", "--build", "build-hosted"]
-# CMD ["-j"]
-CMD ["bash"]
+ENTRYPOINT ["cmake", "--build", "build-q7s"]
+CMD ["-j"]
+# CMD ["bash"]