diff --git a/.github/workflows/training_bootc.yaml b/.github/workflows/training_bootc.yaml
index e6a2a0ad..15e7f868 100644
--- a/.github/workflows/training_bootc.yaml
+++ b/.github/workflows/training_bootc.yaml
@@ -134,16 +134,16 @@ jobs:
 
       - name: Build Image
         id: build_image
-        run: make bootc DRIVER_VERSION=${{ matrix.driver_version }} ARCH=${{ matrix.arch }}
+        run: make bootc DRIVER_VERSION=${{ matrix.driver_version }} ARCH=${{ matrix.arch }} SSH_PUBKEY=~/.ssh/id_rsa.pub
         working-directory: ${{ matrix.context }}
 
       - name: Push image
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: redhat-actions/push-to-registry@v2.8
         with:
-          image: ${{ steps.build_image.outputs.image }}
-          tags: ${{ steps.build_image.outputs.tags }}
-          registry: ${{ env.REGISTRY }}
+          image: ${{ matrix.image_name }}
+          tags: latest
+          registry: ${{ env.REGISTRY }}/${{ env.REGISTRY_ORG }}
 
       - name: Publish Job Results to Slack
         id: slack
@@ -192,16 +192,16 @@ jobs:
 
       - name: Build Image
         id: build_image
-        run: make bootc ARCH=${{ matrix.arch }}
+        run: make bootc ARCH=${{ matrix.arch }} INSTRUCTLAB_IMAGE=${{env.REGISTRY}}/${{env.REGISTRY_ORG}}/instruct-${{ matrix.gpu }}:latest
         working-directory: ${{ matrix.context }}
 
       - name: Push image
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: redhat-actions/push-to-registry@v2.8
         with:
-          image: ${{ steps.build_image.outputs.image }}
-          tags: ${{ steps.build_image.outputs.tags }}
-          registry: ${{ env.REGISTRY }}
+          image: ${{ matrix.image_name }}
+          tags: latest
+          registry: ${{ env.REGISTRY }}/${{ env.REGISTRY_ORG }}
 
       - name: Publish Job Results to Slack
         id: slack