diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 56c925ab5..600e7ff77 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,6 +32,9 @@ jobs:
         sudo rm -f /swapfile >/dev/null 2>&1 || true
         sudo apt-get autoremove -y >/dev/null 2>&1 || true
         sudo apt-get autoclean -y >/dev/null 2>&1 || true
+        sudo rm -rf "/usr/local/share/boost" >/dev/null 2>&1 || true
+        sudo rm -rf "$AGENT_TOOLSDIRECTORY" >/dev/null 2>&1 || true
+        sudo docker rmi $(docker images -qf "dangling=true") >/dev/null 2>&1 || true
         df -h
     - name: Clone source code
       working-directory: ../../
@@ -67,14 +70,6 @@ jobs:
         OMR_TARGET: ${{ matrix.OMR_TARGET }}
       run: |
         make IGNORE_ERRORS=m -C $OMR_TARGET/source package/{compile,install,index} -j$(nproc) || make IGNORE_ERRORS=m -C $OMR_TARGET/source package/{compile,install,index} -j1 V=s
-    - name: Free disk space
-      working-directory: ../../omr
-      env:
-        OMR_TARGET: ${{ matrix.OMR_TARGET }}
-      run: |
-        df -h
-        sudo rm -rf $OMR_TARGET/source/dl
-        df -h
     - name: Build image
       working-directory: ../../omr
       env: