diff --git a/services/base-image/contents/install_aws_sdk.sh b/services/base-image/contents/install_aws_sdk.sh
index e0e3f5774..663b97ea4 100755
--- a/services/base-image/contents/install_aws_sdk.sh
+++ b/services/base-image/contents/install_aws_sdk.sh
@@ -1,20 +1,15 @@
 #!/bin/bash
 
 set -e
 
-if [[ -d /usr/lib/aws-sdk-cpp ]]; then
-  echo "aws-sdk already exists, skipping installation(if the installation seems to be broken, remove this container/image and recreate it)..."
-  exit 0
-fi
+cd /tmp
 
-pushd /usr/lib
-
-git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp -b 1.9.176
-mkdir aws_sdk_build
-pushd aws_sdk_build
-cmake ../aws-sdk-cpp/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/usr/local/aws_sdk -DBUILD_ONLY="core;s3;dynamodb"
+git clone --recurse-submodules -b 1.9.176 --single-branch https://github.com/aws/aws-sdk-cpp
+mkdir aws-sdk-cpp/build
+pushd aws-sdk-cpp/build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/usr/local/aws_sdk -DBUILD_ONLY="core;s3;dynamodb"
 make
 make install
 
-popd # aws_sdk_build
-popd # /usr/lib
+popd # aws-sdk-cpp/build
+rm -rf aws-sdk-cpp
diff --git a/services/tunnelbroker/docker/install_amqp_cpp.sh b/services/tunnelbroker/docker/install_amqp_cpp.sh
index 554616d33..52dff4547 100755
--- a/services/tunnelbroker/docker/install_amqp_cpp.sh
+++ b/services/tunnelbroker/docker/install_amqp_cpp.sh
@@ -1,21 +1,15 @@
 #!/bin/bash
 set -e
 
-if [[ -d /usr/lib/AMQP-CPP ]]; then
-  echo "AMQP-CPP sources already exists, you can try remove this container/image and recreate it."
-  echo "Installation skipped."
-  exit 0
-fi
-
-pushd /usr/lib
+cd /tmp
 
 git clone --recurse-submodules -b v4.3.16 --single-branch https://github.com/CopernicaMarketingSoftware/AMQP-CPP
 pushd AMQP-CPP
 mkdir build
 pushd build
 cmake .. -DAMQP-CPP_BUILD_SHARED=ON -DAMQP-CPP_LINUX_TCP=ON
 cmake --build . --target install
 
 popd # build
 popd # AMQP-CPP-BUILD
-popd # /usr/lib
+rm -rf AMQP-CPP-BUILD
diff --git a/services/tunnelbroker/docker/install_aws_sdk.sh b/services/tunnelbroker/docker/install_aws_sdk.sh
deleted file mode 100755
index 0287541fb..000000000
--- a/services/tunnelbroker/docker/install_aws_sdk.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ -d /usr/lib/aws-sdk-cpp ]]; then
-  echo "AWS-SDK sources already exists, you can try remove this container/image and recreate it."
-  echo "Installation skipped."
-  exit 0
-fi
-
-pushd /usr/lib
-
-git clone --recurse-submodules -b 1.9.176 --single-branch https://github.com/aws/aws-sdk-cpp
-mkdir aws_sdk_build
-pushd aws_sdk_build
-cmake ../aws-sdk-cpp/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/usr/local/aws_sdk -DBUILD_ONLY="core;dynamodb"
-make
-make install
-
-popd # aws_sdk_build
-popd # /usr/lib
diff --git a/services/tunnelbroker/docker/install_cryptopp.sh b/services/tunnelbroker/docker/install_cryptopp.sh
index aea4b2c5b..36a392c66 100755
--- a/services/tunnelbroker/docker/install_cryptopp.sh
+++ b/services/tunnelbroker/docker/install_cryptopp.sh
@@ -1,21 +1,15 @@
 #!/bin/bash
 set -e
 
-if [[ -d /usr/lib/cryptopp ]]; then
-  echo "Cryptopp sources already exists, you can try remove this container/image and recreate it."
-  echo "Installation skipped."
-  exit 0
-fi
-
-pushd /usr/lib
+cd /tmp
 
 git clone --recurse-submodules -b CRYPTOPP_8_6_0 --single-branch https://github.com/weidai11/cryptopp
 pushd cryptopp
 mkdir build
 CXXFLAGS="-DNDEBUG -g2 -O3 -std=c++11"
 make
 make libcryptopp.pc
 make install
 
 popd # cryptopp
-popd # /usr/lib
+rm -rf cryptopp
diff --git a/services/tunnelbroker/docker/install_libuv.sh b/services/tunnelbroker/docker/install_libuv.sh
index 02a6863c5..e46793483 100755
--- a/services/tunnelbroker/docker/install_libuv.sh
+++ b/services/tunnelbroker/docker/install_libuv.sh
@@ -1,21 +1,15 @@
 #!/bin/bash
 set -e
 
-if [[ -d /usr/lib/libuv ]]; then
-  echo "Libuv sources already exists, you can try remove this container/image and recreate it."
-  echo "Installation skipped."
-  exit 0
-fi
-
-pushd /usr/lib
+cd /tmp
 
 git clone --recurse-submodules -b v1.43.0 --single-branch https://github.com/libuv/libuv.git
 pushd libuv
 mkdir build
 cd build
 cmake .. -DBUILD_TESTING=OFF
 make
 make install
 
 popd # libuv
-popd # /usr/lib
+rm -rf libuv