diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 56ca5f23..141ebbc4 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -15,21 +15,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: keystone-api
-          tags: |
-            type=semver,pattern={{version}}
-            type=raw,value=latest
-
       - name: Build image
         uses: docker/build-push-action@v5
         with:
           context: .
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: keystone-api:latest
           outputs: type=docker,dest=/tmp/keystone-api.tar
 
       - name: Upload image artifact
diff --git a/.github/workflows/Publish.yml b/.github/workflows/Publish.yml
index 9e715f02..9407917b 100644
--- a/.github/workflows/Publish.yml
+++ b/.github/workflows/Publish.yml
@@ -3,9 +3,6 @@ name: Publish Docker
 on:
   workflow_call:
 
-env:
-  IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/keystone-api
-
 jobs:
   publish-docker:
     runs-on: ubuntu-latest
@@ -24,6 +21,15 @@ jobs:
       - name: Load image
         run: docker load --input /tmp/keystone-api.tar
 
+      - name: Define Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository_owner }}/keystone-api
+          tags: |
+            type=semver,pattern={{version}}
+            type=raw,value=latest
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -36,3 +42,5 @@ jobs:
         with:
           context: .
           push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}