diff --git a/linux/advanced/vscode-server/android/Dockerfile b/linux/advanced/vscode-server/android/Dockerfile
index 5a1e5f882..7500f5b36 100644
--- a/linux/advanced/vscode-server/android/Dockerfile
+++ b/linux/advanced/vscode-server/android/Dockerfile
@@ -35,7 +35,8 @@ RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licen
 #RUN export SDKMAN_DIR="/usr/local/sdkman" && curl -s "https://get.sdkman.io?rcupdate=false" | bash
 #RUN export SDKMAN_DIR="/config/.sdkman" && curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -s "https://get.sdkman.io" | bash
 COPY ./sdkman.sh /tmp/sdkman.sh
-RUN export SDKMAN_DIR="/config/.sdkman" && chmod +x /tmp/sdkman.sh && bash /tmp/sdkman.sh
+RUN export SDKMAN_DIR="/config/.sdkman" && chmod +x /tmp/sdkman.sh
+RUN /tmp/sdkman.sh
 
 ##################################################################
 #                   Gradle
diff --git a/linux/advanced/vscode-server/devops/Dockerfile b/linux/advanced/vscode-server/devops/Dockerfile
index 5487ada2a..a27b10342 100644
--- a/linux/advanced/vscode-server/devops/Dockerfile
+++ b/linux/advanced/vscode-server/devops/Dockerfile
@@ -281,7 +281,8 @@ RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licen
 #RUN export SDKMAN_DIR="/usr/local/sdkman" && curl -s "https://get.sdkman.io?rcupdate=false" | bash
 #RUN export SDKMAN_DIR="/config/.sdkman" && curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -s "https://get.sdkman.io" | bash
 COPY ./sdkman.sh /tmp/sdkman.sh
-RUN export SDKMAN_DIR="/config/.sdkman" && chmod +x /tmp/sdkman.sh && bash /tmp/sdkman.sh
+RUN export SDKMAN_DIR="/config/.sdkman" && chmod +x /tmp/sdkman.sh
+RUN /tmp/sdkman.sh
 
 ##################################################################
 #                   Gradle
diff --git a/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile
index 24cb2fefa..bbcf5b4e1 100644
--- a/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/android-sdk/Dockerfile
@@ -24,7 +24,8 @@ RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licen
 ##################################################################
 #RUN curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -s "http://get.sdkman.io" | bash
 COPY ./sdkman.sh /tmp/sdkman.sh
-RUN export SDKMAN_DIR="/config/.sdkman" && chmod +x /tmp/sdkman.sh && bash /tmp/sdkman.sh
+RUN export SDKMAN_DIR="/config/.sdkman" && chmod +x /tmp/sdkman.sh
+RUN /tmp/sdkman.sh
 
 ##################################################################
 #                   Gradle
@@ -44,8 +45,4 @@ RUN apt clean -y && \
     apt autoclean -y && \
     rm -rfv /var/lib/apt/lists/* && \
     rm -rfv /var/cache/apt/archives/*.deb && \
-    rm -rfv /tmp/deb/* && \
-    rm -rfv /tmp/composer-setup.php && \
-    rm -rfv /tmp/amxx_base_latest.tar.gz && \
-    rm -rfv /tmp/atlassian-plugin-sdk.deb && \
-    rm -rfv /tmp/addons
+    rm -rfv /tmp/*
\ No newline at end of file