diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index ee10cb7..32343b8 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -3,27 +3,10 @@ name: 🏗️ Build PR
 on:
   pull_request: ~
 
-env:
-  stream: "pr-${{ github.event.pull_request.number }}"
-
 jobs:
   build:
-    name: Build Docker image
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        node: [ '20', '22', '24' ]
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: 🐋 Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: 🏗️ Build  Docker image
-        uses: docker/bake-action@v6
-        env:
-          NODE_VERSION: ${{ matrix.node }}
-          STREAM: ${{ env.stream }}
+    uses: ./.github/workflows/build-push.yml
+    with:
+      stream: "pr-${{ github.event.pull_request.number }}"
+      push: true
+    secrets: inherit
diff --git a/.github/workflows/build-push-latest.yml b/.github/workflows/build-push-latest.yml
index e49f3c2..9442eb4 100644
--- a/.github/workflows/build-push-latest.yml
+++ b/.github/workflows/build-push-latest.yml
@@ -13,5 +13,4 @@ jobs:
     uses: ./.github/workflows/build-push.yml
     with:
       stream: latest
-      push: true
     secrets: inherit
diff --git a/.github/workflows/build-push-stable.yml b/.github/workflows/build-push-stable.yml
index 3ddd240..9ad500d 100644
--- a/.github/workflows/build-push-stable.yml
+++ b/.github/workflows/build-push-stable.yml
@@ -13,5 +13,4 @@ jobs:
     uses: ./.github/workflows/build-push.yml
     with:
       stream: stable
-      push: true
     secrets: inherit
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index dfe0b86..8cfd99a 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -3,18 +3,14 @@ name: 🏗️ Build and Push
 on:
   workflow_call:
     inputs:
-      runs_on:
-        type: string
-        default: ubuntu-latest
-        description: The image to run the jobs.
       stream:
         type: string
         default: latest
         description: The stream to build (e.g latest or stable).
       push:
         type: boolean
-        default: false
-        description: Whether to push the built image to the registry.
+        default: true
+        description: Push the images up to the container registries.
 
     secrets:
       DOCKERHUB_USERNAME:
@@ -25,12 +21,7 @@ on:
 jobs:
   build:
     name: Build Docker image
-    runs-on: ${{ inputs.runs_on }}
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -56,7 +47,7 @@ jobs:
       - name: 🏗️ Build and push Docker image
         uses: docker/bake-action@v6
         env:
-          PHP_VERSION: ${{ matrix.php }}
+          NODE_VERSION: ${{ matrix.node }}
           STREAM: ${{ inputs.stream }}
         with:
           push: ${{ inputs.push }}
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 7975dd2..ea95c96 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -42,6 +42,7 @@ group "default" {
 target "prod" {
   inherits = ["_common"]
   context = "."
+  target = "run"
 
   contexts = {
     from_image = "docker-image://node:${NODE_VERSION}-alpine${ALPINE_VERSION}"