diff --git a/.github/workflows/removed/cooker.yml b/.github/workflows/removed/cooker.yml
index ff8330e3..3fe7c469 100644
--- a/.github/workflows/removed/cooker.yml
+++ b/.github/workflows/removed/cooker.yml
@@ -68,7 +68,7 @@ jobs:
 
       - name: Buld part 1 - Until melonds
         run: |
-          sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+          sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/.local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
 
       - name: Compress cache
         run: |
@@ -140,8 +140,8 @@ jobs:
 
       - name: Create Bundle
         run: |
-          sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
-          sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck
+          sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/.local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+          sudo flatpak build-bundle $GITHUB_WORKSPACE/.local RetroDECK.flatpak net.retrodeck.retrodeck
 
       - name: Get date for artifacts
         id: date
diff --git a/.github/workflows/removed/main.yml b/.github/workflows/removed/main.yml
index 0404e018..25396232 100644
--- a/.github/workflows/removed/main.yml
+++ b/.github/workflows/removed/main.yml
@@ -69,7 +69,7 @@ jobs:
 
       - name: Buld part 1 - Until melonds
         run: |
-          sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-main net.retrodeck.retrodeck.yml
+          sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/.local retrodeck-flatpak-main net.retrodeck.retrodeck.yml
 
       - name: Compress cache
         run: |
@@ -141,8 +141,8 @@ jobs:
 
       - name: Create Bundle
         run: |
-          sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-main net.retrodeck.retrodeck.yml
-          sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck
+          sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/.local retrodeck-flatpak-main net.retrodeck.retrodeck.yml
+          sudo flatpak build-bundle $GITHUB_WORKSPACE/.local RetroDECK.flatpak net.retrodeck.retrodeck
 
       - name: Read version from version file
         id: version
diff --git a/.gitignore b/.gitignore
index f7355c0a..b8639b5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ tmp
 .godot
 rd-submodules/es-de/patches-tmp*
 .local/
+buildid
 
 # Python #
 ##########
diff --git a/automation_tools/flatpak_build_bundle.sh b/automation_tools/flatpak_build_bundle.sh
index cef69eff..ab2847c5 100755
--- a/automation_tools/flatpak_build_bundle.sh
+++ b/automation_tools/flatpak_build_bundle.sh
@@ -3,7 +3,7 @@
 # This is building the bundle RetroDECK.flatpak after the download and build steps are done
 
 if [ "${GITHUB_REF##*/}" = "main" ]; then
-    flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
+    flatpak build-bundle ${GITHUB_WORKSPACE}/.local RetroDECK.flatpak net.retrodeck.retrodeck
 else
-    flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck
+    flatpak build-bundle ${GITHUB_WORKSPACE}/.local RetroDECK-cooker.flatpak net.retrodeck.retrodeck
 fi
\ No newline at end of file
diff --git a/automation_tools/flatpak_build_download_only.sh b/automation_tools/flatpak_build_download_only.sh
index 31f006d0..d07f118a 100755
--- a/automation_tools/flatpak_build_download_only.sh
+++ b/automation_tools/flatpak_build_download_only.sh
@@ -17,7 +17,7 @@ mkdir -vp "${GITHUB_WORKSPACE}"/{local,retrodeck-flatpak-cooker}
 flatpak-builder --user --force-clean \
     --install-deps-from=flathub \
     --install-deps-from=flathub-beta \
-    --repo="${GITHUB_WORKSPACE}/local" \
+    --repo="${GITHUB_WORKSPACE}/.local" \
     --download-only \
     "${GITHUB_WORKSPACE}/${FOLDER}" \
     net.retrodeck.retrodeck.yml
diff --git a/automation_tools/flatpak_build_only.sh b/automation_tools/flatpak_build_only.sh
index 6ec4597f..18cc58c0 100755
--- a/automation_tools/flatpak_build_only.sh
+++ b/automation_tools/flatpak_build_only.sh
@@ -12,13 +12,13 @@ else
     FOLDER=retrodeck-flatpak-cooker
 fi
 
-mkdir -vp ${GITHUB_WORKSPACE}/local
+mkdir -vp ${GITHUB_WORKSPACE}/.local
 mkdir -vp ${GITHUB_WORKSPACE}/"$FOLDER"
 
 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}/"$FOLDER" \
     net.retrodeck.retrodeck.yml
diff --git a/build-locally.sh b/build-locally.sh
index c1e218c5..647db560 100755
--- a/build-locally.sh
+++ b/build-locally.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 export GITHUB_WORKSPACE="."
+cp net.retrodeck.retrodeck.appdata.xml net.retrodeck.retrodeck.appdata.xml.bak
+cp net.retrodeck.retrodeck.yml net.retrodeck.retrodeck.yml.bak
 
 automation_tools/install_dependencies.sh
 automation_tools/cooker_build_id.sh
@@ -11,3 +13,7 @@ automation_tools/flatpak_build_download_only.sh
 automation_tools/flatpak_build_only.sh
 automation_tools/flatpak_build_bundle.sh
 
+rm -f net.retrodeck.retrodeck.appdata.xml 
+rm -f net.retrodeck.retrodeck.yml
+cp net.retrodeck.retrodeck.appdata.xml.bak net.retrodeck.retrodeck.appdata.xml
+cp net.retrodeck.retrodeck.yml.bak net.retrodeck.retrodeck.yml