diff --git a/.github/workflows/build_engine.yml b/.github/workflows/build_engine.yml
index 04ff14224..828af972c 100644
--- a/.github/workflows/build_engine.yml
+++ b/.github/workflows/build_engine.yml
@@ -25,10 +25,23 @@ jobs:
     needs: findengine
     outputs:
       app_ids: ${{env.APP_IDS }}
-    container: ${{ needs.findengine.outputs.container }}
+    container:
+        image: ${{ needs.findengine.outputs.container }}
+        volumes:
+            - /usr/share/dotnet:/gh/dotnet
+            - /opt/ghc:/gh/ghc
+            - /usr/local/share/boost:/gh/boost
+            - /usr/local/lib/android:/gh/android
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+    - name: Cleanup GH Environment
+      run: |
+        sudo rm -rf /gh/dotnet/*
+        sudo rm -rf /gh/ghc/*
+        sudo rm -rf /gh/boost/*
+        sudo rm -rf /gh/android/*
+        df -h
     - name: Build
       run: ./common/start_build.sh ${{needs.findengine.outputs.engine}}
     - name: Package
diff --git a/.github/workflows/test_engine.yml b/.github/workflows/test_engine.yml
index 6a77c3817..af264ef72 100644
--- a/.github/workflows/test_engine.yml
+++ b/.github/workflows/test_engine.yml
@@ -22,10 +22,24 @@ jobs:
   build:
     runs-on: ubuntu-latest
     needs: findengine
-    container: ${{ needs.findengine.outputs.container }}
+    container:
+        image: ${{ needs.findengine.outputs.container }}
+        volumes:
+            - /usr/share/dotnet:/gh/dotnet
+            - /opt/ghc:/gh/ghc
+            - /usr/local/share/boost:/gh/boost
+            - /usr/local/lib/android:/gh/android
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+    - name: Cleanup GH Environment
+      run: |
+        df -h
+        sudo rm -rf /gh/dotnet/*
+        sudo rm -rf /gh/ghc/*
+        sudo rm -rf /gh/boost/*
+        sudo rm -rf /gh/android/*
+        df -h
     - name: Build
       run: ./common/start_build.sh ${{needs.findengine.outputs.engine}}
     - name: Package
diff --git a/engines/doom-runner/build.sh b/engines/doom-runner/build.sh
index 7a2ae7661..36f002e7a 100755
--- a/engines/doom-runner/build.sh
+++ b/engines/doom-runner/build.sh
@@ -19,5 +19,4 @@ popd
 
 # COPY PHASE
 cp -rfv source/build/DoomRunner "$diststart/common/dist"
-
 cp -rfv "assets"/* "$diststart/common/dist"