diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index e3aa337..337dd52 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -24,8 +24,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Extract metadata for the Docker image
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: schmelczera/great_ai
+
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: schmelczera/great_ai:latest,schmelczera/great_ai:${GITHUB_REF##*/}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+    
\ No newline at end of file