diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 611a50cf..b917f7de 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -32,6 +32,15 @@ jobs:
             type=raw,value=latest
             type=raw,value={{date 'YYYYMMDD'}}
 
+      - name: Extract metadata for Alpine
+        id: meta-alpine
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=alpine
+            type=raw,prefix=alpine-,value={{date 'YYYYMMDD'}}
+
       - name: Build and push regular image
         uses: docker/build-push-action@v5
         with:
@@ -47,7 +56,5 @@ jobs:
           context: .
           file: ./Dockerfile-alpine
           push: true
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:alpine
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:alpine-{{date 'YYYYMMDD'}}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta-alpine.outputs.tags }}
+          labels: ${{ steps.meta-alpine.outputs.labels }}