diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index b34577c..81c4c29 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -26,6 +26,12 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        
+      - name: Docker metadata
+        id: docker-meta
+        uses: docker/metadata-action@v5
+        with:
+          images: yooooomi/your_spotify # required dummy value, will not be used
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -40,6 +46,7 @@ jobs:
           file: ./Dockerfile.client.production
           platforms: linux/amd64,linux/arm64
           push: true
+          labels: ${{ steps.docker-meta.outputs.labels }}
           tags: |
             yooooomi/your_spotify_client:nightly
             yooooomi/your_spotify_client:${{ github.sha }}
@@ -51,6 +58,7 @@ jobs:
           file: ./Dockerfile.server.production
           platforms: linux/amd64,linux/arm64
           push: true
+          labels: ${{ steps.docker-meta.outputs.labels }}
           tags: |
             yooooomi/your_spotify_server:nightly
             yooooomi/your_spotify_server:${{ github.sha }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7199436..7fa703b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,6 +22,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Docker metadata
+        id: docker-meta
+        uses: docker/metadata-action@v5
+        with:
+          images: yooooomi/your_spotify # required dummy value, will not be used
+
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -39,6 +45,7 @@ jobs:
           file: ./Dockerfile.client.production
           platforms: linux/amd64,linux/arm64
           push: true
+          labels: ${{ steps.docker-meta.outputs.labels }}
           tags: |
             yooooomi/your_spotify_client:latest
             yooooomi/your_spotify_client:${{ steps.tag.outputs.tag }}
@@ -50,6 +57,7 @@ jobs:
           file: ./Dockerfile.server.production
           platforms: linux/amd64,linux/arm64
           push: true
+          labels: ${{ steps.docker-meta.outputs.labels }}
           tags: |
             yooooomi/your_spotify_server:latest
             yooooomi/your_spotify_server:${{ steps.tag.outputs.tag }}