diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index e50ca1720..73319d3f1 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -1,6 +1,10 @@
 name: Docker Image Build
 
 on:
+  pull_request:
+    branches:
+      - master
+      - uv-migration
   push:
     branches:
       - master
@@ -103,8 +107,7 @@ jobs:
         run: |
           uv run python -m tools.image_builder \
             --build-target=${{ matrix.board }} \
-            --service=${{ matrix.service }} \
-            --push
+            --service=${{ matrix.service }}
 
       - name: Inspect cache after build
         run: |
diff --git a/docker/Dockerfile.base.j2 b/docker/Dockerfile.base.j2
index a50d3eb69..899058ff1 100644
--- a/docker/Dockerfile.base.j2
+++ b/docker/Dockerfile.base.j2
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
 # https://github.com/balena-io-library/base-images/issues/562
 RUN c_rehash
 
-{% if board in ['pi1', 'pi2'] %}
+{% if target_platform in ['linux/arm/v6', 'linux/arm/v7', 'linux/arm/v8'] %}
 RUN pip3 install uv --break-system-packages
 {% else %}
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /usr/local/bin/
diff --git a/tools/image_builder/__main__.py b/tools/image_builder/__main__.py
index 40e672c2d..d8fa70ba0 100644
--- a/tools/image_builder/__main__.py
+++ b/tools/image_builder/__main__.py
@@ -112,6 +112,7 @@ def build_image(
             'git_branch': git_branch,
             'git_hash': git_hash,
             'git_short_hash': git_short_hash,
+            'target_platform': target_platform,
             **context,
         },
     )