diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index ba1f8785..17c0855a 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -5,19 +5,17 @@ on:
     branches:
      - cooker*
      - feat*
+     - branch/cooker*
     paths:
      - '.github/workflows/**'
      - 'automation_tools/**'
      - 'config/**'
-     - 'config/es-de/**'
      - 'functions/**'
      - 'rd-submodules/**'
      - '*.sh'
      - 'net.retrodeck.retrodeck.yml'
      - 'net.retrodeck.retrodeck.appdata.xml'
-  pull_request_target: 
-    branches:
-     - cooker*
+  pull_request:
 
   # Italy (CET): 11:00 PM
   # Japan (JST): 7:00 AM
@@ -33,7 +31,7 @@ jobs:
 
   Building_RetroDECK:
     runs-on: retrodeck
-    steps:        
+    steps:
 
       # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317
       - name: Remove stuck mounts
@@ -55,12 +53,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: 'true'
-
-      - name: Checkout PR branch (include changes)
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          git fetch origin +refs/pull/${{ github.event.pull_request.number }}/merge
-          git checkout -qf FETCH_HEAD
         
       - name: "Install dependencies"
         run: "automation_tools/install_dependencies.sh"    
@@ -97,7 +89,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