diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f5fe4d3a..5d8b8e35 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -70,6 +70,13 @@ jobs:
 #        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
 #        with:
 #            images: bluecherrydvr/bluecherry
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: bluecherrydvr/bluecherry
+          
       - name: Build and push Docker image
         uses: docker/build-push-action@v4     
         with:
@@ -79,5 +86,5 @@ jobs:
   #          password: ${{ secrets.DOCKER_PASSWORD }}   
 #            file: ./server/Dockerfile
             push: true
-            tags: bluecherrydvr/bluecherry:unstable
-            labels: github_ci                 
+            tags: ${{ steps.meta.outputs.tags }}
+            labels: ${{ steps.meta.outputs.labels }}