diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d55dda..7bbec70 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
     runs-on: ubuntu-24.04
     outputs:
       tag: ${{ steps.vars.outputs.tag }}
-      image-name: ${{ steps.vars.outputs.image-name }}
+      stackrox-io-image: ${{ steps.vars.outputs.stackrox-io-image }}
       rhacs-eng-image: ${{ steps.vars.outputs.rhacs-eng-image }}
     steps:
     - uses: actions/checkout@v4
@@ -88,7 +88,7 @@ jobs:
       run: |
         cat << EOF >> "$GITHUB_OUTPUT"
         tag=$(make tag)
-        image-name=$(make image-name)
+        stackrox-io-image=$(make image-name)
         rhacs-eng-image=$(FACT_REGISTRY="quay.io/rhacs-eng/fact" make image-name)
         EOF
 
@@ -105,6 +105,8 @@ jobs:
     env:
       FACT_TAG: ${{ needs.vars.outputs.tag }}-${{ matrix.arch }}
       FACT_VERSION: ${{ needs.vars.outputs.tag }}
+      STACKROX_IO_IMAGE: ${{ needs.vars.outputs.stackrox-io-image }}-${{ matrix.arch }}
+      RHACS_ENG_IMAGE: ${{ needs.vars.outputs.rhacs-eng-image }}-${{ matrix.arch }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -119,7 +121,7 @@ jobs:
         username: ${{ secrets.QUAY_STACKROX_IO_RW_USERNAME }}
         password: ${{ secrets.QUAY_STACKROX_IO_RW_PASSWORD }}
 
-    - run: docker push "$(make image-name)"
+    - run: docker push "${STACKROX_IO_IMAGE}"
 
     - name: Login to quay.io/rhacs-eng
       uses: docker/login-action@v3
@@ -130,8 +132,7 @@ jobs:
 
     - name: Tag and push to rhacs-eng
       run: |
-        RHACS_ENG_IMAGE="$(FACT_REGISTRY="quay.io/rhacs-eng/fact" make image-name)"
-        docker tag "$(make image-name)" "${RHACS_ENG_IMAGE}"
+        docker tag "${STACKROX_IO_IMAGE}" "${RHACS_ENG_IMAGE}"
         docker push "${RHACS_ENG_IMAGE}"
 
   manifest:
@@ -156,7 +157,7 @@ jobs:
 
       - uses: ./collector/.github/actions/create-multiarch-manifest
         with:
-          base-image: ${{ needs.vars.outputs.image-name }}
+          base-image: ${{ needs.vars.outputs.stackrox-io-image }}
           archs: ${{ env.ARCHS }}
 
       - uses: docker/login-action@v3