diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
index 6007294ee0..9097590280 100644
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -242,9 +242,12 @@ jobs:
         asset_name: OrcaSlicer-Linux-flatpak_nightly_${{ matrix.variant.arch }}.flatpak
         asset_content_type: application/octet-stream
         max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
-    - name: Fix ownership of root-owned files on self-hosted runners
+    - name: Clean up and fix ownership on self-hosted runners
       if: ${{ always() && vars.SELF_HOSTED }}
       run: |
+        # Remove disposable dirs (re-downloaded/regenerated on next run)
+        rm -rf .flatpak-builder/build .flatpak-builder/downloads .flatpak-builder/rofiles
+        # Fix ownership of cache dirs so the runner user can access them
         runner_uid=$(stat -c '%u' .)
         chown -R "$runner_uid:$runner_uid" .flatpak-builder
       shell: bash