diff --git a/automation_tools/flatpak_build_bundle.sh b/automation_tools/flatpak_build_bundle.sh
index 68c1a93f..7386f195 100755
--- a/automation_tools/flatpak_build_bundle.sh
+++ b/automation_tools/flatpak_build_bundle.sh
@@ -3,7 +3,6 @@
 # This is building the bundle RetroDECK.flatpak after the download and build steps are done
 
 if [ $PERSISTENCE==true ]; then
-    mkdir -p "$HOME/cooker-persistent"
     GITHUB_WORKSPACE_BACKUP="$GITHUB_WORKSPACE"
     GITHUB_WORKSPACE="$HOME/cooker-persistent"
 fi
diff --git a/automation_tools/flatpak_build_download_only.sh b/automation_tools/flatpak_build_download_only.sh
index 1579bee9..a0943ed1 100755
--- a/automation_tools/flatpak_build_download_only.sh
+++ b/automation_tools/flatpak_build_download_only.sh
@@ -23,8 +23,8 @@ if [ $PERSISTENCE==true ]; then
     --install-deps-from=flathub-beta \
     --repo="${GITHUB_WORKSPACE}/.local" \
     --download-only \
-    "${GITHUB_WORKSPACE_BACKUP}/${FOLDER}" \
-    net.retrodeck.retrodeck.yml
+    "${GITHUB_WORKSPACE}/${FOLDER}" \
+    "${GITHUB_WORKSPACE_BACKUP}/${FOLDER}"/net.retrodeck.retrodeck.yml
 
     GITHUB_WORKSPACE="$GITHUB_WORKSPACE_BACKUP"
 
diff --git a/automation_tools/flatpak_build_only.sh b/automation_tools/flatpak_build_only.sh
index d32c4609..ab930e7c 100755
--- a/automation_tools/flatpak_build_only.sh
+++ b/automation_tools/flatpak_build_only.sh
@@ -23,10 +23,10 @@ if [ $PERSISTENCE==true ]; then
     flatpak-builder --user --force-clean \
     --install-deps-from=flathub \
     --install-deps-from=flathub-beta \
-    --repo=${GITHUB_WORKSPACE}/.local \
+    --repo="${GITHUB_WORKSPACE}/.local" \
     --disable-download \
-    ${GITHUB_WORKSPACE_BACKUP}/"$FOLDER" \
-    net.retrodeck.retrodeck.yml
+    "${GITHUB_WORKSPACE}/${FOLDER}" \
+    "${GITHUB_WORKSPACE_BACKUP}/${FOLDER}"/net.retrodeck.retrodeck.yml
 
     GITHUB_WORKSPACE="$GITHUB_WORKSPACE_BACKUP"