diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a0b7fc8..6a7e652 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -14,6 +14,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            caddy
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -31,4 +41,5 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
           push: true
-          tags: ${{ vars.DOCKERHUB_REPO }}:2.10.0 , ${{ vars.DOCKERHUB_REPO }}:latest
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}