diff --git a/.github/workflows/publish-server-image.yml b/.github/workflows/publish-server-image.yml
index c145dd2..deb4b49 100644
--- a/.github/workflows/publish-server-image.yml
+++ b/.github/workflows/publish-server-image.yml
@@ -96,6 +96,15 @@ jobs:
           cache-to: type=gha,mode=max,scope=pr-${{ github.event.pull_request.number }}-${{ matrix.name }}
           provenance: false
           sbom: false
+      - name: Tag built computer image for tooling test
+        if: matrix.name == 'computer'
+        env:
+          TAGS: ${{ steps.meta.outputs.tags }}
+          IMAGE: ghcr.io/${{ steps.ns.outputs.repo }}/computer:sha-${{ github.sha }}
+        run: |
+          set -euo pipefail
+          src_tag="$(printf '%s\n' "$TAGS" | sed '/^[[:space:]]*$/d' | head -1)"
+          docker tag "$src_tag" "$IMAGE"
       - name: Verify computer image tooling
         if: matrix.name == 'computer'
         env: