diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5725710..aecce69 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,10 +44,8 @@ jobs:
           tags: |
             type=ref,event=branch
             type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern=v{{version}}
-            type=semver,pattern=v{{major}}.{{minor}}
+            type=sha,format=short
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -94,6 +92,8 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build
+    outputs:
+      imagejson: ${{ steps.meta.outputs.json }}
     steps:
       -
         name: Download digests
@@ -114,10 +114,8 @@ jobs:
           tags: |
             type=ref,event=branch
             type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern=v{{version}}
-            type=semver,pattern=v{{major}}.{{minor}}
+            type=sha,format=short
       -
         name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -160,19 +158,6 @@ jobs:
     -
       name: Download Build Context for Test Script
       uses: actions/checkout@v4
-    -
-      name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        images: ${{ env.REGISTRY_IMAGE }}
-        tags: |
-          type=ref,event=branch
-          type=ref,event=pr
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=semver,pattern=v{{version}}
-          type=semver,pattern=v{{major}}.{{minor}}
     -
       name: Install just
       uses: extractions/setup-just@v3
@@ -180,4 +165,4 @@ jobs:
         just-version: 1.26.0
     - 
       name: Test the Image
-      run: ./ci/test-ldmx-sw $(jq -r .tags[0] <<< "${DOCKER_METADATA_OUTPUT_JSON}") ${{ matrix.ldmx_sw }}
+      run: ./ci/test-ldmx-sw $(echo '${{ needs.merge.outputs.imagejson }}' | jq -r .tags[0]) ${{ matrix.ldmx_sw }}