diff --git a/.github/workflows/onpr_check-pr.yaml b/.github/workflows/onpr_check-pr.yaml
index d13d231b36..ecc6ee12fc 100644
--- a/.github/workflows/onpr_check-pr.yaml
+++ b/.github/workflows/onpr_check-pr.yaml
@@ -93,6 +93,21 @@ jobs:
       - name: ↩️ Checkout
         uses: actions/checkout@v7
 
+      - name: Copy templates into addon build context
+        env:
+          ADDON: ${{ matrix.addon }}
+        run: |
+          set -euo pipefail
+          TEMPLATES_DIR=".templates"
+          ADDON_DIR="./$ADDON"
+
+          # Keep PR builds aligned with the production builder.
+          for script in ha_automodules.sh ha_autoapps.sh ha_entrypoint.sh bashio-standalone.sh ha_lsio.sh; do
+            if [ -f "$TEMPLATES_DIR/$script" ]; then
+              cp "$TEMPLATES_DIR/$script" "$ADDON_DIR/$script"
+            fi
+          done
+
       - name: ℹ️ Gather addon info
         id: information
         uses: frenck/action-addon-information@v1.4
diff --git a/free_games_claimer/CHANGELOG.md b/free_games_claimer/CHANGELOG.md
index d2be5a5acc..03e069e080 100644
--- a/free_games_claimer/CHANGELOG.md
+++ b/free_games_claimer/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.0.1 (2026-07-17)
+
+- Aligned the pull-request build context with the production builder by copying
+  the shared Home Assistant helper scripts before building the add-on.
+- Fixed aarch64 and amd64 PR validation failing on unresolved Dockerfile
+  `COPY` instructions. Runtime and migration behavior are unchanged.
+
 ## 2.0.0 (2026-07-17)
 
 - Replaced the abandoned `vogler/free-games-claimer` upstream with
diff --git a/free_games_claimer/config.yaml b/free_games_claimer/config.yaml
index d7ef4caf99..69e1f0c7cc 100644
--- a/free_games_claimer/config.yaml
+++ b/free_games_claimer/config.yaml
@@ -1,3 +1,4 @@
+# Free Games Claimer Remaster
 arch:
   - aarch64
   - amd64
@@ -95,5 +96,5 @@ schema:
 slug: free_games_claimer
 udev: true
 url: https://github.com/alexbelgium/hassio-addons
-version: "2.0.0"
+version: "2.0.1"
 webui: "[PROTO:ssl]://[HOST]:[PORT:6080]"