diff --git a/Dockerfile b/Dockerfile
index 37941ee..a5bff28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ ENV USER_NAME builder
 ENV PATH=$PATH:/root/.local/bin
 ENV DEBIAN_FRONTEND noninteractive
 ENV PIP_DEFAULT_TIMEOUT 1000
+ENV WORKSPACE_PATH=/opt/workspace
 ENV CPPFLAGS "-Wall -std=c++11 -fPIC"
 ENV CXXFLAGS "-Wall -std=c++11 -fPIC"
 
@@ -32,6 +33,5 @@ COPY scripts /opt/scripts
 RUN chown -R $USER_NAME:$USER_NAME /opt/scripts
 
 USER $USER_NAME
-WORKDIR /opt/workspace
-
+WORKDIR ${WORKSPACE_PATH}
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
index f01e17d..d6153ab 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -15,6 +15,7 @@ else
   if [ ! -z "$BUILDALL" ]; then
     cd /opt/scripts
     bash build_all.sh
+    ls -alh ${WORKSPACE_PATH}
   else
     bash
   fi
diff --git a/scripts/boost/build.sh b/scripts/boost/build.sh
index 10cbff3..9730861 100755
--- a/scripts/boost/build.sh
+++ b/scripts/boost/build.sh
@@ -64,7 +64,7 @@ if [ -x "$(command -v qibuild)" ]; then
   export CMAKE_INSTALL_DIR="${INSTALL_DIR}/${CMAKE_RELATIVE_DIR}"
   mkdir -p "${CMAKE_INSTALL_DIR}"
   cp -rv "${CMAKE_LOCAL_DIR}/"* "${CMAKE_INSTALL_DIR}"
-  sudo qitoolchain make-package --auto --name ${NAME} --version "1.${LIB_VER}.0" --target linux64 ${INSTALL_DIR} --output /opt/workspace/
+  sudo qitoolchain make-package --auto --name ${NAME} --version "1.${LIB_VER}.0" --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
 else
   echo "Qibuild is not installed, skipping packaging"
 fi
diff --git a/scripts/eigen3/build.sh b/scripts/eigen3/build.sh
index ad8ec8c..69a0b86 100755
--- a/scripts/eigen3/build.sh
+++ b/scripts/eigen3/build.sh
@@ -39,7 +39,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 if [ -x "$(command -v qibuild)" ]; then
   echo "------------ Building qitoolchain package ----------------"
-  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
+  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
 else
   echo "Qibuild is not installed, skipping packaging"
 fi
diff --git a/scripts/icu/build.sh b/scripts/icu/build.sh
index 29834c3..a566a55 100755
--- a/scripts/icu/build.sh
+++ b/scripts/icu/build.sh
@@ -33,7 +33,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 if [ -x "$(command -v qibuild)" ]; then
   echo "------------ Building qitoolchain package ----------------"
-  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
+  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
 else
   echo "Qibuild is not installed, skipping packaging"
 fi
diff --git a/scripts/json-nlohmann/build.sh b/scripts/json-nlohmann/build.sh
index b249160..12c294a 100755
--- a/scripts/json-nlohmann/build.sh
+++ b/scripts/json-nlohmann/build.sh
@@ -40,7 +40,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 if [ -x "$(command -v qibuild)" ]; then
   echo "------------ Building qitoolchain package ----------------"
-  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
+  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
 else
   echo "Qibuild is not installed, skipping packaging"
 fi
diff --git a/scripts/libusb/build.sh b/scripts/libusb/build.sh
index f0df8cb..8e8bb06 100755
--- a/scripts/libusb/build.sh
+++ b/scripts/libusb/build.sh
@@ -33,7 +33,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 if [ -x "$(command -v qibuild)" ]; then
   echo "------------ Building qitoolchain package ----------------"
-  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
+  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
 else
   echo "Qibuild is not installed, skipping packaging"
 fi
diff --git a/scripts/openssl/build.sh b/scripts/openssl/build.sh
index f528c3a..65fc991 100755
--- a/scripts/openssl/build.sh
+++ b/scripts/openssl/build.sh
@@ -35,7 +35,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 if [ -x "$(command -v qibuild)" ]; then
   echo "------------ Building qitoolchain package ----------------"
-  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
+  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
 else
   echo "Qibuild is not installed, skipping packaging"
 fi
diff --git a/scripts/qt5/build.sh b/scripts/qt5/build.sh
index b21aa8e..d868cc4 100644
--- a/scripts/qt5/build.sh
+++ b/scripts/qt5/build.sh
@@ -43,7 +43,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 if [ -x "$(command -v qibuild)" ]; then
   echo "------------ Building qitoolchain package ----------------"
-  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
+  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
 else
   echo "Qibuild is not installed, skipping packaging"
 fi
diff --git a/scripts/sqlite3/build.sh b/scripts/sqlite3/build.sh
index ff60392..17b4e82 100755
--- a/scripts/sqlite3/build.sh
+++ b/scripts/sqlite3/build.sh
@@ -32,7 +32,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 if [ -x "$(command -v qibuild)" ]; then
   echo "------------ Building qitoolchain package ----------------"
-  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
+  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
 else
   echo "Qibuild is not installed, skipping packaging"
 fi
diff --git a/scripts/tinyxml/build.sh b/scripts/tinyxml/build.sh
index db5be3f..d3d5141 100755
--- a/scripts/tinyxml/build.sh
+++ b/scripts/tinyxml/build.sh
@@ -38,7 +38,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 if [ -x "$(command -v qibuild)" ]; then
   echo "------------ Building qitoolchain package ----------------"
-  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
+  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
 else
   echo "Qibuild is not installed, skipping packaging"
 fi
diff --git a/scripts/zlib/build.sh b/scripts/zlib/build.sh
index c2d7730..7e845fb 100755
--- a/scripts/zlib/build.sh
+++ b/scripts/zlib/build.sh
@@ -32,7 +32,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 if [ -x "$(command -v qibuild)" ]; then
   echo "------------ Building qitoolchain package ----------------"
-  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
+  sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
 else
   echo "Qibuild is not installed, skipping packaging"
 fi