diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index bc9a6a40..99aa131e 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -54,6 +54,7 @@ jobs:
       - name: Clone RetroDECK repo
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           submodules: 'true'
           ref: ${{ github.sha }}
         
@@ -92,7 +93,7 @@ jobs:
             echo "[DEBUG] source branch is: $source_branch"
 
             # Generate the tag for a pull request
-            echo "TAG=PR-$GITHUB_RUN_ID-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV
+            echo "TAG=PR-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV
             echo "MAKE_LATEST=false" >> $GITHUB_ENV  # Not marked as the latest cooker version if it's a feature branch
           else
             # Generate the tag for non-pull request branches