diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml
index 08a45271..4dc25ebf 100644
--- a/.github/workflows/cooker.yml
+++ b/.github/workflows/cooker.yml
@@ -133,15 +133,15 @@ jobs:
           sudo apt install flatpak flatpak-builder p7zip-full
           sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
-          sudo flatpak-builder --download-only --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
 
       - name: Bulding part 1 - Until melonds
         #if: steps.cache-cooker.outputs.cache-hit != 'true'
-        run: sudo flatpak-builder --build-only --disable-download --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+        run: sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
 
       - name: Compressing cache
         run: |
           touch retrodeck-cooker.tar.gz
+          rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
           tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker 
 
       - name: Upload build specific cache
@@ -188,6 +188,7 @@ jobs:
   #     - name: Compressing cache
   #       run: |
   #         touch retrodeck-cooker.tar.gz
+          rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
   #         tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker 
 
   #     - name: Upload build specific cache
@@ -234,11 +235,12 @@ jobs:
       - name: Finishing build
         #if: steps.cache-cooker.outputs.cache-hit != 'true'
         run: |
-          sudo flatpak-builder --user --force-clean --disable-download --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+          sudo flatpak-builder --user --force-clean --repo=$GITHUB_WORKSPACE/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
 
       - name: Compressing cache
         run: |
           touch retrodeck-cooker.tar.gz
+          rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
           tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker 
 
       - name: Upload build specific cache
@@ -291,6 +293,7 @@ jobs:
       - name: Compressing cache
         run: |
           touch retrodeck-cooker.tar.gz
+          rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
           tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker 
 
       - name: Upload build specific cache
@@ -352,6 +355,7 @@ jobs:
       - name: Compressing cache
         run: |
           touch retrodeck-cooker.tar.gz
+          rm -rf .flatpak-builder/build/*-{2,3,4,5,6}
           tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz .flatpak-builder retrodeck-flatpak-cooker 
 
       - name: Upload global cache