diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml
index e241f92..97cac60 100644
--- a/.github/workflows/tag-and-release.yaml
+++ b/.github/workflows/tag-and-release.yaml
@@ -29,7 +29,8 @@ jobs:
 
     strategy:
       matrix:
-        k3s_version:
+        k3s_image_repository: ["rancher/k3s"]
+        k3s_image_version:
           ["v1.28.8-k3s1", "v1.29.8-k3s1", "v1.30.4-k3s1", "v1.31.0-k3s1"]
 
     permissions:
@@ -48,8 +49,13 @@ jobs:
 
       - name: Publish the base capability
         run: |
-          uds zarf package create --confirm -a arm64 -o oci://ghcr.io/justinthelaw/packages --set K3S_IMAGE_VERSION=${{ matrix.k3s_version }}
-          uds zarf package create --confirm -a amd64 -o oci://ghcr.io/justinthelaw/packages --set K3S_IMAGE_VERSION=${{ matrix.k3s_version }}
+          uds zarf package create --confirm -a arm64 -o oci://ghcr.io/justinthelaw/packages \
+            --set K3S_IMAGE_REPOSITORY=${{ matrix.k3s_image_repository }} \
+            --set K3S_IMAGE_VERSION=${{ matrix.k3s_image_version }}
+
+          uds zarf package create --confirm -a amd64 -o oci://ghcr.io/justinthelaw/packages \
+            --set K3S_IMAGE_REPOSITORY=${{ matrix.k3s_image_repository }} \
+            --set K3S_IMAGE_VERSION=${{ matrix.k3s_image_version }}
 
   publish-uds-cuda-package:
     needs: tag-new-version
@@ -58,9 +64,10 @@ jobs:
 
     strategy:
       matrix:
-        k3s_version:
+        k3s_image_repository: ["rancher/k3s"]
+        k3s_image_version:
           ["v1.28.8-k3s1", "v1.29.8-k3s1", "v1.30.4-k3s1", "v1.31.0-k3s1"]
-        CUDA_IMAGE_VERSION:
+        cuda_image_version:
           [
             11.8.0-base-ubuntu22.04,
             12.1.0-base-ubuntu22.04,
@@ -85,8 +92,9 @@ jobs:
       - name: Publish the CUDA K3s image
         run: |
           uds run publish-cuda-image \
-            --set K3S_IMAGE_VERSION="${{ matrix.k3s_version }}" \
-            --set CUDA_IMAGE_VERSION="${{ matrix.CUDA_IMAGE_VERSION }}" \
+            --set K3S_IMAGE_REPOSITORY=${{ matrix.k3s_image_repository }} \
+            --set K3S_IMAGE_VERSION="${{ matrix.k3s_image_version }}" \
+            --set CUDA_IMAGE_VERSION="${{ matrix.cuda_image_version }}" \
             --no-progress
 
       - name: Publish the CUDA capability