diff --git a/.github/workflows/build-agent-container.yml b/.github/workflows/build-agent-container.yml
index d3e0f5f61..b8fff3c00 100644
--- a/.github/workflows/build-agent-container.yml
+++ b/.github/workflows/build-agent-container.yml
@@ -3,6 +3,7 @@ name: Build Agent
 on:
   workflow_run:
     workflows: ["Build Production Rust Code"]
+    branches: [main]
     types: 
       - completed
 
@@ -44,12 +45,12 @@ jobs:
         workflow: ${{ github.event.workflow_run.workflow_id }}
         workflow_conclusion: success
         commit: ${{ github.event.workflow_run.head_sha }}
-        name: rust-${{ matrix.arch.label }}-binaries
+        name: rust-${{ matrix.arch }}-binaries
         path: /tmp
 
     - name: Unpack Rust binaries
       run: |
-        tar -xvf /tmp/rust-${{ matrix.arch.label }}-binaries.tar
+        tar -xvf /tmp/rust-${{ matrix.arch }}-binaries.tar
 
     - name: Run Per-Arch component build for ${{ env.AKRI_COMPONENT }}
       uses: ./.github/actions/build-component-per-arch
diff --git a/.github/workflows/build-controller-container.yml b/.github/workflows/build-controller-container.yml
index a1c93c1cf..8c512f252 100644
--- a/.github/workflows/build-controller-container.yml
+++ b/.github/workflows/build-controller-container.yml
@@ -3,6 +3,7 @@ name: Build Controller
 on:
   workflow_run:
     workflows: ["Build Production Rust Code"]
+    branches: [main]
     types: 
       - completed
 
@@ -43,12 +44,12 @@ jobs:
         workflow: ${{ github.event.workflow_run.workflow_id }}
         workflow_conclusion: success
         commit: ${{ github.event.workflow_run.head_sha }}
-        name: rust-${{ matrix.arch.label }}-binaries
+        name: rust-${{ matrix.arch }}-binaries
         path: /tmp
 
     - name: Unpack Rust binaries
       run: |
-        tar -xvf /tmp/rust-${{ matrix.arch.label }}-binaries.tar
+        tar -xvf /tmp/rust-${{ matrix.arch }}-binaries.tar
 
     - name: Run Per-Arch component build for ${{ env.AKRI_COMPONENT }}
       uses: ./.github/actions/build-component-per-arch
diff --git a/.github/workflows/build-udev-video-broker-container.yml b/.github/workflows/build-udev-video-broker-container.yml
index d8ad1004b..7d610124f 100644
--- a/.github/workflows/build-udev-video-broker-container.yml
+++ b/.github/workflows/build-udev-video-broker-container.yml
@@ -3,6 +3,7 @@ name: Build UDEV Broker
 on:
   workflow_run:
     workflows: ["Build Production Rust Code"]
+    branches: [main]
     types: 
       - completed
 
@@ -44,12 +45,12 @@ jobs:
         workflow: ${{ github.event.workflow_run.workflow_id }}
         workflow_conclusion: success
         commit: ${{ github.event.workflow_run.head_sha }}
-        name: rust-${{ matrix.arch.label }}-binaries
+        name: rust-${{ matrix.arch }}-binaries
         path: /tmp
 
     - name: Unpack Rust binaries
       run: |
-        tar -xvf /tmp/rust-${{ matrix.arch.label }}-binaries.tar
+        tar -xvf /tmp/rust-${{ matrix.arch }}-binaries.tar
 
     - name: Run Per-Arch component build for ${{ env.AKRI_COMPONENT }}
       uses: ./.github/actions/build-component-per-arch
diff --git a/.github/workflows/build-webhook-configuration-container.yml b/.github/workflows/build-webhook-configuration-container.yml
index c26781880..9704a8908 100644
--- a/.github/workflows/build-webhook-configuration-container.yml
+++ b/.github/workflows/build-webhook-configuration-container.yml
@@ -3,6 +3,7 @@ name: Build Webhook Configuration
 on:
   workflow_run:
     workflows: ["Build Production Rust Code"]
+    branches: [main]
     types: 
       - completed
 
@@ -43,12 +44,12 @@ jobs:
           workflow: ${{ github.event.workflow_run.workflow_id }}
           workflow_conclusion: success
           commit: ${{ github.event.workflow_run.head_sha }}
-          name: rust-${{ matrix.arch.label }}-binaries
+          name: rust-${{ matrix.arch }}-binaries
           path: /tmp
 
       - name: Unpack Rust binaries
         run: |
-          tar -xvf /tmp/rust-${{ matrix.arch.label }}-binaries.tar
+          tar -xvf /tmp/rust-${{ matrix.arch }}-binaries.tar
 
       - name: Run Per-Arch component build for ${{ env.AKRI_COMPONENT }}
         uses: ./.github/actions/build-component-per-arch