diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ced7a33fdc7d9ec3228529ff65af3b70e6239b13..d6427de5a63b8cb20617305f13417cee21d90d07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ win_visual_studio_static_local_deps:
         - cd build_scripts\windows
         - call win_download_dependencies.bat
         - set DEPENDENCIES_LINK_TYPE=static
+        - set clean_after=yes
         - call win_VS_build_x64_debug.bat
         - cd ..\..
 
@@ -77,6 +78,7 @@ ubuntu_boost_system:
         - export TERM=xterm
         - cd build_scripts/linux
         - export DEPENDENCIES_LINK_TYPE=shared
+        - export CLEAN_AFTER=yes
         - ./linux_gcc_build_x64_debug_system.sh
         - cd ../..
 
@@ -98,6 +100,7 @@ ubuntu_boost_local_static_deps:
         - cd build_scripts/linux
         - ./download_dependencies.sh
         - export DEPENDENCIES_LINK_TYPE=static
+        - export CLEAN_AFTER=yes
         - ./linux_gcc_build_x64_debug_local.sh
         - cd ../..
 
@@ -119,6 +122,7 @@ ubuntu_boost_local_dynamic_deps:
         - cd build_scripts/linux
         - ./download_dependencies.sh
         - export DEPENDENCIES_LINK_TYPE=shared
+        - export CLEAN_AFTER=yes
         - ./linux_gcc_build_x64_debug_local.sh
         - cd ../..
 
diff --git a/build_scripts/linux/linux_gcc_build_x64_debug_local.sh b/build_scripts/linux/linux_gcc_build_x64_debug_local.sh
index 1f272757c85a0e08203af0dac8172c151b78cf3f..4bb73b687d710fa4c75af10f41cca48d695fc756 100755
--- a/build_scripts/linux/linux_gcc_build_x64_debug_local.sh
+++ b/build_scripts/linux/linux_gcc_build_x64_debug_local.sh
@@ -22,6 +22,9 @@ CXX_COMPILER="g++"
 C_COMPILER="gcc"
 
 #**********************DO NOT CHANGE BEYOND THIS LINE****************************************
+if [ -z ${DEPENDENCIES_LINK_TYPE} ]; then DEPENDENCIES_LINK_TYPE=static; fi
+if [ -z ${CLEAN_AFTER} ]; then CLEAN_AFTER=yes; fi
+
 export LINK_TYPE=static
 if [ $DEPENDENCIES_LINK_TYPE = "shared" ]
 then
diff --git a/build_scripts/linux/linux_gcc_build_x64_debug_system.sh b/build_scripts/linux/linux_gcc_build_x64_debug_system.sh
index 0ab7e2f637ca0a194eda6c7ccf579cf9b6309d04..b729c581ef6fece246992e55fb351810c011d9a6 100755
--- a/build_scripts/linux/linux_gcc_build_x64_debug_system.sh
+++ b/build_scripts/linux/linux_gcc_build_x64_debug_system.sh
@@ -20,6 +20,8 @@ CXX_COMPILER="g++"
 C_COMPILER="gcc"
 
 #**********************DO NOT CHANGE BEYOND THIS LINE****************************************
+if [ -z ${DEPENDENCIES_LINK_TYPE} ]; then DEPENDENCIES_LINK_TYPE=static; fi
+if [ -z ${CLEAN_AFTER} ]; then CLEAN_AFTER=yes; fi
 
 LINK_TYPE=static
 if [ $DEPENDENCIES_LINK_TYPE = "shared" ]
diff --git a/external_dependencies/boost b/external_dependencies/boost
index 7ff9ae132ba8e8d9ecc329788a55b6e54139068b..0792dde1c543aba10d66d634f923e6993f9699d3 160000
--- a/external_dependencies/boost
+++ b/external_dependencies/boost
@@ -1 +1 @@
-Subproject commit 7ff9ae132ba8e8d9ecc329788a55b6e54139068b
+Subproject commit 0792dde1c543aba10d66d634f923e6993f9699d3