diff --git a/.github/workflows/build-containers-pr.yml b/.github/workflows/build-containers-pr.yml
index c5cca9badd6..f5fb3699628 100644
--- a/.github/workflows/build-containers-pr.yml
+++ b/.github/workflows/build-containers-pr.yml
@@ -33,6 +33,10 @@ jobs:
     if: ${{ needs.check-skip.outputs.changed }}
     runs-on: ubuntu-20.04
     steps:
+      - name: Free additional disk space (remove Android SDK + Tools)
+        run: |
+          sudo rm -rf /usr/local/lib/android
+
       - name: vars
         id: vars
         run: |
diff --git a/.github/workflows/build-containers-target-branch.yml b/.github/workflows/build-containers-target-branch.yml
index dafe221a23e..7c68f9f4ee0 100644
--- a/.github/workflows/build-containers-target-branch.yml
+++ b/.github/workflows/build-containers-target-branch.yml
@@ -33,6 +33,10 @@ jobs:
     if: ${{ needs.check-skip.outputs.changed }}
     runs-on: ubuntu-20.04
     steps:
+      - name: Free additional disk space (remove Android SDK + Tools)
+        run: |
+          sudo rm -rf /usr/local/lib/android
+
       - name: vars
         id: vars
         run: |
diff --git a/.github/workflows/build-test-eclwatch.yml b/.github/workflows/build-test-eclwatch.yml
index 13eee0bfa2a..9f23791cba3 100644
--- a/.github/workflows/build-test-eclwatch.yml
+++ b/.github/workflows/build-test-eclwatch.yml
@@ -32,6 +32,9 @@ jobs:
     if: ${{ needs.pre_job.outputs.eclwatch }}
     runs-on: ubuntu-20.04
     steps:
+      - name: Free additional disk space (remove Android SDK + Tools)
+        run: |
+          sudo rm -rf /usr/local/lib/android
       - uses: actions/checkout@v2
         with:
           submodules: "recursive"
diff --git a/.github/workflows/nightly-publish.yml b/.github/workflows/nightly-publish.yml
index 3aab3451a45..05b47fc4a09 100644
--- a/.github/workflows/nightly-publish.yml
+++ b/.github/workflows/nightly-publish.yml
@@ -9,6 +9,10 @@ jobs:
     runs-on: ubuntu-20.04
     if: github.repository == 'hpcc-systems/HPCC-Platform'
     steps:
+      - name: Free additional disk space (remove Android SDK + Tools)
+        run: |
+          sudo rm -rf /usr/local/lib/android
+
       - name: vars
         id: vars
         run: |
diff --git a/.github/workflows/smoketest.yml b/.github/workflows/smoketest.yml
index 0428925cbaf..9f8cf1bfbb0 100644
--- a/.github/workflows/smoketest.yml
+++ b/.github/workflows/smoketest.yml
@@ -74,6 +74,11 @@ jobs:
       cache-state: ${{ steps.check-cache.outputs.state }}
 
     steps:
+
+    - name: Free additional disk space (remove Android SDK + Tools)
+      run: |
+        sudo rm -rf /usr/local/lib/android
+
     - name: Setup and git clone
       id: vars
       run: |