diff --git a/.github/workflows/build-distributed.yml b/.github/workflows/build-distributed.yml
index 2f1c66f..c10b822 100644
--- a/.github/workflows/build-distributed.yml
+++ b/.github/workflows/build-distributed.yml
@@ -91,8 +91,10 @@ jobs:
         name: repo-0
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier base-tools --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -172,8 +174,10 @@ jobs:
         name: repo-1
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier build-tools --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -249,8 +253,10 @@ jobs:
         name: repo-2
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier glib2-bootstrap --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -329,8 +335,10 @@ jobs:
         name: repo-3
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier bootstrap-libs --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -406,8 +414,10 @@ jobs:
         name: repo-4
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier cairo-layer --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -483,8 +493,10 @@ jobs:
         name: repo-5
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier gi-bootstrap --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -560,8 +572,10 @@ jobs:
         name: repo-6
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier glib2-full --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -637,8 +651,10 @@ jobs:
         name: repo-7
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier gi-full --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -716,8 +732,10 @@ jobs:
         name: repo-8
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier core-libraries --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -796,8 +814,10 @@ jobs:
         name: repo-9
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier system-tools --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -876,8 +896,10 @@ jobs:
         name: repo-10
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier gtk-core --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -955,8 +977,10 @@ jobs:
         name: repo-11
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier desktop-foundations\
-        \ --package ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force\
+        \ --package ${{ matrix.package }})\nif [[ \"${FORCE}
         \ }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh\
         \ \"${ARGS[@]}\"\n"
     - name: Find new RPMs
@@ -1033,8 +1057,10 @@ jobs:
         name: repo-12
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier shell-foundations\
-        \ --package ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force\
+        \ --package ${{ matrix.package }})\nif [[ \"${FORCE}
         \ }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh\
         \ \"${ARGS[@]}\"\n"
     - name: Find new RPMs
@@ -1112,8 +1138,10 @@ jobs:
         name: repo-13
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier gnome-shell --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
@@ -1191,8 +1219,10 @@ jobs:
         name: repo-14
         path: local-repo
     - name: Build package
+      env:
+        FORCE: ${FORCE}
       run: "touch .build-marker\nARGS=(--backend podman --tier session-layer --package\
-        \ ${{ matrix.package }})\nif [[ \"${{ github.event.inputs.force }}\" == \"\
+        \ ${{ matrix.package }})\nif [[ \"${FORCE}\" == \"\
         true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\
         \n"
     - name: Find new RPMs
diff --git a/.github/workflows/build-gnome49-distributed.yml b/.github/workflows/build-gnome49-distributed.yml
index 5396e28..2495b2f 100644
--- a/.github/workflows/build-gnome49-distributed.yml
+++ b/.github/workflows/build-gnome49-distributed.yml
@@ -88,7 +88,9 @@ jobs:
         name: repo-0
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier base-tools --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier base-tools --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -160,7 +162,9 @@ jobs:
         name: repo-1
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier build-tools --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier build-tools --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -231,7 +235,9 @@ jobs:
         name: repo-2
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier glib2-bootstrap --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier glib2-bootstrap --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -302,7 +308,9 @@ jobs:
         name: repo-3
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier gi-bootstrap --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier gi-bootstrap --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -373,7 +381,9 @@ jobs:
         name: repo-4
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier glib2-full --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier glib2-full --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -444,7 +454,9 @@ jobs:
         name: repo-5
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier gi-full --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier gi-full --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -518,7 +530,9 @@ jobs:
         name: repo-6
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier core-libraries --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier core-libraries --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -593,7 +607,9 @@ jobs:
         name: repo-7
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier gtk-core --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier gtk-core --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -669,7 +685,9 @@ jobs:
         name: repo-8
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier gjs-layer --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier gjs-layer --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -741,7 +759,9 @@ jobs:
         name: repo-9
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier shell-foundations --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier shell-foundations --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -814,7 +834,9 @@ jobs:
         name: repo-10
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier gnome-shell --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier gnome-shell --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
@@ -889,7 +911,9 @@ jobs:
         name: repo-11
         path: local-repo
     - name: Build package
-      run: "touch .build-marker\nARGS=(--backend podman --tier session-layer --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${{ github.event.inputs.force }}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
+      env:
+        FORCE: ${FORCE}
+      run: "touch .build-marker\nARGS=(--backend podman --tier session-layer --package ${{ matrix.package }} --manifest build-order-gnome49.yml --mock-config centos-stream-10-ci-gnome49)\nif [[ \"${FORCE}\" == \"true\" ]]; then\n  ARGS+=(--force)\nfi\n./scripts/build-chain.sh \"${ARGS[@]}\"\n"
     - name: Find new RPMs
       id: find-rpms
       run: 'mkdir -p new-rpms
diff --git a/.github/workflows/build-gnome49-package.yml b/.github/workflows/build-gnome49-package.yml
index ed3889e..3ebbdb6 100644
--- a/.github/workflows/build-gnome49-package.yml
+++ b/.github/workflows/build-gnome49-package.yml
@@ -34,11 +34,13 @@ jobs:
 
       - name: Detect changed packages
         id: detect
+        env:
+          PACKAGE_PATH: ${{ github.event.inputs.package_path || '' }}
         run: |
           SESSION_PKGS='mutter|gnome-shell|gdm'
-          if [[ -n "${{ github.event.inputs.package_path }}" ]]; then
+          if [[ -n "${PACKAGE_PATH}" ]]; then
             # Manual dispatch: use explicit path
-            PACKAGES='["${{ github.event.inputs.package_path }}"]'
+            PACKAGES=$(python3 -c "import json; print(json.dumps(['${PACKAGE_PATH}']))")
           else
             # Detect from changed files
             BASE="${{ github.event.pull_request.base.sha || github.event.before }}"
diff --git a/.github/workflows/build-gnome50-package.yml b/.github/workflows/build-gnome50-package.yml
index 8ec34e6..7522f9d 100644
--- a/.github/workflows/build-gnome50-package.yml
+++ b/.github/workflows/build-gnome50-package.yml
@@ -33,10 +33,12 @@ jobs:
 
       - name: Detect changed packages
         id: detect
+        env:
+          PACKAGE_PATH: ${{ github.event.inputs.package_path || '' }}
         run: |
           SESSION_PKGS='mutter|gnome-shell|gdm'
-          if [[ -n "${{ github.event.inputs.package_path }}" ]]; then
-            PACKAGES='["${{ github.event.inputs.package_path }}"]'
+          if [[ -n "${PACKAGE_PATH}" ]]; then
+            PACKAGES=$(python3 -c "import json; print(json.dumps(['${PACKAGE_PATH}']))")
           else
             BASE="${{ github.event.pull_request.base.sha || github.event.before }}"
             HEAD="${{ github.sha }}"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea163cb..8a4c214 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -90,9 +90,10 @@ jobs:
           EOF
 
       - name: Pull mock runner image
+        env:
+          MOCK_IMAGE: ${{ github.event.inputs.image || env.MOCK_RUNNER_IMAGE }}
         run: |
-          IMAGE="${{ github.event.inputs.image || env.MOCK_RUNNER_IMAGE }}"
-          podman pull "${IMAGE}"
+          podman pull "${MOCK_IMAGE}"
 
       - name: Seed local repo from R2
         run: |
@@ -104,21 +105,25 @@ jobs:
           createrepo_c "${LOCAL_REPO}"
 
       - name: Build packages
+        env:
+          BUILD_IMAGE: ${{ github.event.inputs.image || env.MOCK_RUNNER_IMAGE }}
+          BUILD_TIER: ${{ github.event.inputs.tier || '' }}
+          BUILD_PACKAGES: ${{ github.event.inputs.packages || '' }}
+          BUILD_JOBS: ${{ github.event.inputs.jobs || '' }}
         run: |
-          IMAGE="${{ github.event.inputs.image || env.MOCK_RUNNER_IMAGE }}"
           ARGS=(
             --backend podman
-            --image   "${IMAGE}"
+            --image   "${BUILD_IMAGE}"
             --local-repo "${LOCAL_REPO}"
           )
-          if [[ -n "${{ github.event.inputs.tier }}" ]]; then
-            ARGS+=(--tier "${{ github.event.inputs.tier }}")
+          if [[ -n "${BUILD_TIER}" ]]; then
+            ARGS+=(--tier "${BUILD_TIER}")
           fi
-          if [[ -n "${{ github.event.inputs.packages }}" ]]; then
-            ARGS+=(--package "${{ github.event.inputs.packages }}")
+          if [[ -n "${BUILD_PACKAGES}" ]]; then
+            ARGS+=(--package "${BUILD_PACKAGES}")
           fi
-          if [[ -n "${{ github.event.inputs.jobs }}" ]]; then
-            ARGS+=(--jobs "${{ github.event.inputs.jobs }}")
+          if [[ -n "${BUILD_JOBS}" ]]; then
+            ARGS+=(--jobs "${BUILD_JOBS}")
           fi
           ./scripts/build-chain.sh "${ARGS[@]}"