diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index 6f85ad8..a07233a 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -22,31 +22,34 @@ on:
 jobs:
   build:
     runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        platform: ${{ fromJSON(format('["{0}"]', inputs.platform)) }}
-        ros_distro: ${{ fromJSON(format('["{0}"]', inputs.ros_distro)) }}
-      fail-fast: false
+    env:
+      PLATFORM: ${{ inputs.platform }}
+      ROS_DISTRO: ${{ inputs.ros_distro }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Debug inputs
+        run: |
+          echo "PLATFORM=$PLATFORM"
+          echo "ROS_DISTRO=$ROS_DISTRO"
+
       # ── Stage 1: cc-base ─────────────────────────────────────────────
       - name: Build cc-base
         run: docker compose -f cross_compile/compose.yaml build cc-base
 
       # ── Stage 2: cc-toolchain ─────────────────────────────────────────
-      - name: Build cc-toolchain (${{ matrix.platform }})
-        run: PLATFORM=${{ matrix.platform }} docker compose -f cross_compile/compose.yaml build cc-toolchain
+      - name: Build cc-toolchain
+        run: docker compose -f cross_compile/compose.yaml build cc-toolchain
 
       # ── Stage 3: vendor-packages ──────────────────────────────────────
-      - name: Build vendor-packages (${{ matrix.platform }})
-        run: PLATFORM=${{ matrix.platform }} docker compose -f cross_compile/compose.yaml build vendor-packages
+      - name: Build vendor-packages
+        run: docker compose -f cross_compile/compose.yaml build vendor-packages
 
       # ── Stage 4: ros2 ─────────────────────────────────────────────────
-      - name: Build ROS 2 (${{ matrix.ros_distro }})
-        run: PLATFORM=${{ matrix.platform }} ROS_DISTRO=${{ matrix.ros_distro }} docker compose -f cross_compile/compose.yaml build ros2
+      - name: Build ROS 2
+        run: docker compose -f cross_compile/compose.yaml build ros2
 
       # ── Summary ───────────────────────────────────────────────────────
       - name: Image summary