diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
index c631660..5335151 100644
--- a/.github/workflows/test-and-build.yaml
+++ b/.github/workflows/test-and-build.yaml
@@ -33,6 +33,13 @@ jobs:
         name: Get the tag name
         run: |
           echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: pihole/pihole
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -55,5 +62,5 @@ jobs:
             PIHOLE_TAG=${{ env.TAG }}
             PIHOLE_VERSION=${{ env.TAG }}
           push: true
-          tags: |
-            pihole/pihole:${{ env.TAG }}
\ No newline at end of file
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file