diff --git a/.github/workflows/epicmorg.advanced.teamcity.servers.yml b/.github/workflows/epicmorg.advanced.teamcity.servers.yml
index 9b14e2982..083e6e84a 100644
--- a/.github/workflows/epicmorg.advanced.teamcity.servers.yml
+++ b/.github/workflows/epicmorg.advanced.teamcity.servers.yml
@@ -36,9 +36,21 @@ jobs:
     - name: "Build and Deploy Advanced Teamcity Server Image:"
       run:  cd linux/advanced/teamcity/server/latest && pwd && make build && make deploy
 
+##################################################################################
+
+    - name: Cleanup
+      run: make clean
+
+##################################################################################
     - name: "Build and Deploy Advanced Teamcity Server 2025.03 Image:"
       run:  cd linux/advanced/teamcity/server/2025.03 && pwd && make build && make deploy
 
+##################################################################################
+
+    - name: Cleanup
+      run: make clean
+
+##################################################################################
 
     - name: "Build and Deploy Advanced Teamcity Server 2024.12 Image:"
       run:  cd linux/advanced/teamcity/server/2024.12 && pwd && make build && make deploy
@@ -49,13 +61,24 @@ jobs:
       run: make clean
 
 ##################################################################################
-
     - name: "Build and Deploy Advanced Teamcity Server 2024.07.3 Image:"
       run:  cd linux/advanced/teamcity/server/2024.07.3 && pwd && make build && make deploy
 
+##################################################################################
+
+    - name: Cleanup
+      run: make clean
+
+##################################################################################
     - name: "Build and Deploy Advanced Teamcity Server 2024.03.3 Image:"
       run:  cd linux/advanced/teamcity/server/2024.03.3 && pwd && make build && make deploy
 
+##################################################################################
+
+    - name: Cleanup
+      run: make clean
+
+##################################################################################
     - name: "Build and Deploy Advanced Teamcity Server 2023.05.6 Image:"
       run:  cd linux/advanced/teamcity/server/2023.05.6 && pwd && make build && make deploy
 
@@ -69,6 +92,13 @@ jobs:
     - name: "Build and Deploy Advanced Teamcity Server 2022.10.6 Image:"
       run:  cd linux/advanced/teamcity/server/2022.10.6 && pwd && make build && make deploy
 
+##################################################################################
+
+    - name: Cleanup
+      run: make clean
+
+##################################################################################
+
     - name: "Build and Deploy Advanced Teamcity Server 2022.04.7 Image:"
       run:  cd linux/advanced/teamcity/server/2022.04.7&& pwd && make build && make deploy
 
diff --git a/.github/workflows/epicmorg.advanced.vscode.images.yml b/.github/workflows/epicmorg.advanced.vscode.images.yml
index d550da363..c15b144a5 100644
--- a/.github/workflows/epicmorg.advanced.vscode.images.yml
+++ b/.github/workflows/epicmorg.advanced.vscode.images.yml
@@ -44,6 +44,13 @@ jobs:
     - name: "Build and Deploy Advanced  Vscode Server AMXX 1.10 Images:"
       run:  cd linux/advanced/vscode-server/amxx/1.10 && pwd && make build && make deploy
 
+##################################################################################
+
+    - name: Cleanup
+      run: make clean
+
+##################################################################################
+
     - name: "Build and Deploy Advanced Vscode Server Android Images:"
       run:  cd linux/advanced/vscode-server/android && pwd && make build && make deploy
     
diff --git a/.github/workflows/epicmorg.base.images.gilhub.runners.yml b/.github/workflows/epicmorg.base.images.github.runners.yml
similarity index 100%
rename from .github/workflows/epicmorg.base.images.gilhub.runners.yml
rename to .github/workflows/epicmorg.base.images.github.runners.yml
diff --git a/linux/advanced/vscode-server/android/Dockerfile b/linux/advanced/vscode-server/android/Dockerfile
index a743b0380..9e93c9ca7 100644
--- a/linux/advanced/vscode-server/android/Dockerfile
+++ b/linux/advanced/vscode-server/android/Dockerfile
@@ -124,10 +124,12 @@ RUN chmod +x -R ${KNPL_BIN}
 ENV ANDROID_HOME=${EMG_LOCAL_BASE_DIR}/android/sdk
 ENV ANDROID_SDK_ROOT=${ANDROID_HOME}
 
+COPY tmp/sdkmanager_0.6.11-2_all.deb /tmp
+
 RUN apt-get update && \
+    apt-get install /tmp/sdkmanager_0.6.11-2_all.deb -y && \
     apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
       android-sdk \
-      sdkmanager \
       android-sdk-build-tools \
       android-sdk-platform-tools-common \
       android-sdk-platform-tools \
diff --git a/linux/advanced/vscode-server/android/tmp/sdkmanager_0.6.11-2_all.deb b/linux/advanced/vscode-server/android/tmp/sdkmanager_0.6.11-2_all.deb
new file mode 100644
index 000000000..a73f4dca9
Binary files /dev/null and b/linux/advanced/vscode-server/android/tmp/sdkmanager_0.6.11-2_all.deb differ