diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index b1b2c982..6d314b86 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -44,11 +44,12 @@ jobs:
       # for main remember to change ${HOME} into ${GITHUB_WORKSPACE}
       - name: Build flatpak
         run: |
-          flatpak-builder --user --force-clean --keep-build-dirs --repo=${HOME}/local ${HOME}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+          flatpak-builder --build-only --user --force-clean --repo=${HOME}/local ${HOME}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
 
       - name: Create Bundle
         run: |
-          flatpak build-bundle ${HOME}/local RetroDECK.flatpak net.retrodeck.retrodeck
+          flatpak-builder --user --force-clean --repo=${HOME}/local ${HOME}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+          flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck
 
       - name: Read version from version file
         id: version