diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0fd3c74..c7b9bc4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,6 +35,13 @@ jobs:
         uses: docker/setup-buildx-action@v1
         id: buildx
 
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v2
+        with:
+          images: |
+            ghcr.io/${{ github.repository }}
+
       - name: Build and push image
         uses: docker/build-push-action@v2
         with:
@@ -42,5 +49,5 @@ jobs:
           file: build/Dockerfile
           push: true
           platforms: linux/amd64
-          tags: |
-            ghcr.io/nealey/vail:${{ steps.vars.outputs.tag }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.output.labels }}