diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml
index 3134af6f9..213aedd80 100644
--- a/.github/workflows/docs-ci.yml
+++ b/.github/workflows/docs-ci.yml
@@ -26,12 +26,27 @@ jobs:
           version: "14.0"
           directory: ${{ runner.temp }}/llvm
 
+      # Following https://github.com/marketplace/actions/free-disk-space-ubuntu
       - name: Some cleanup for more disk space
         run: |
-          rm -rf /usr/share/dotnet
-          rm -rf "$AGENT_TOOLSDIRECTORY"
-          apt-get autoremove -y
-          apt-get clean
+          dh -h
+          rm -rf "$AGENT_TOOLSDIRECTORY" || true
+          rm -rf /usr/local/lib/android || true
+          rm -rf /opt/ghc || true
+          rm -rf /usr/local/.ghcup || true
+          rm -rf "$AGENT_TOOLSDIRECTORY" || true
+          swapoff -a || true
+          rm -f /mnt/swapfile || true
+          apt-get remove -y '^aspnetcore-.*' || true
+          apt-get remove -y '^dotnet-.*' --fix-missing || true
+          apt-get remove -y 'php.*' --fix-missing || true
+          apt-get remove -y '^mongodb-.*' --fix-missing || true
+          apt-get remove -y '^mysql-.*' --fix-missing || true
+          apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing || true
+          apt-get remove -y google-cloud-sdk --fix-missing || true
+          apt-get remove -y google-cloud-cli --fix-missing || true
+          apt-get autoremove -y || true
+          apt-get clean || true
           df -h
 
       - name: Install Python Dependencies
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 355ec52a7..ce2517d89 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -30,12 +30,27 @@ jobs:
           version: "14.0"
           directory: ${{ runner.temp }}/llvm
 
+      # Following https://github.com/marketplace/actions/free-disk-space-ubuntu
       - name: Some cleanup for more disk space
-        run: |
-          rm -rf /usr/share/dotnet
-          rm -rf "$AGENT_TOOLSDIRECTORY"
-          apt-get autoremove -y
-          apt-get clean
+        run: |          
+          dh -h
+          rm -rf "$AGENT_TOOLSDIRECTORY" || true
+          rm -rf /usr/local/lib/android || true
+          rm -rf /opt/ghc || true
+          rm -rf /usr/local/.ghcup || true
+          rm -rf "$AGENT_TOOLSDIRECTORY" || true
+          swapoff -a || true
+          rm -f /mnt/swapfile || true
+          apt-get remove -y '^aspnetcore-.*' || true
+          apt-get remove -y '^dotnet-.*' --fix-missing || true
+          apt-get remove -y 'php.*' --fix-missing || true
+          apt-get remove -y '^mongodb-.*' --fix-missing || true
+          apt-get remove -y '^mysql-.*' --fix-missing || true
+          apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing || true
+          apt-get remove -y google-cloud-sdk --fix-missing || true
+          apt-get remove -y google-cloud-cli --fix-missing || true
+          apt-get autoremove -y || true
+          apt-get clean || true
           df -h
 
       - name: Install Python Dependencies