diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index cf82566..a70f8cf 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -22,6 +22,7 @@ jobs:
 
     steps:
       - name: Checkout
+        id: checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           ref: ${{ github.event.workflow_run.head_sha || github.sha }}
@@ -36,15 +37,20 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
 
+      - name: Get image tag
+        id: image
+        run: echo "tag=$(git rev-parse --short=7 HEAD)" >> "$GITHUB_OUTPUT"
+
       - name: Extract metadata
         id: meta
         uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
         with:
-          context: git
           images: ghcr.io/${{ github.repository }}
           tags: |
-            type=sha,prefix=,format=short
+            type=raw,value=${{ steps.image.outputs.tag }}
             type=raw,value=latest
+          labels: |
+            org.opencontainers.image.revision=${{ steps.checkout.outputs.commit }}
 
       - name: Build and push container
         id: build-push