diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 1171a8b7..857bdbae 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -70,12 +70,14 @@ jobs:
         continue-on-error: true
 
       # Sometimes flatpak download fails, in this case it tries a second time
-      - name: Run pre-build automation tasks (retry)
-        if: steps.flatpak-download.outcome == 'failure'
-        run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
       - name: "Build flatpak: download only (retry)"
         if: steps.flatpak-download.outcome == 'failure'
-        run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh"
+        run: |
+          echo "Download failed, maybe some hash changed since the build start."
+          git checkout -- net.retrodeck.retrodeck.yml
+          echo "Recalculating hashes and retrying download..."
+          "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
+          "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh"
 
       - name: Build flatpak
         run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_only.sh"
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index 3730a3ad..0cb68026 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -69,7 +69,12 @@ jobs:
       # Sometimes flatpak download fails, in this case it tries a second time
       - name: "Build flatpak: download only (retry)"
         if: steps.flatpak-download.outcome == 'failure'
-        run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh"
+        run: |
+          echo "Download failed, maybe some hash changed since the build start."
+          git checkout -- net.retrodeck.retrodeck.yml
+          echo "Recalculating hashes and retrying download..."
+          "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
+          "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh"
 
       - name: Build flatpak
         run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_only.sh"