diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 1290360..ac8476c 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -67,7 +67,10 @@ jobs:
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
-          tags: docker.io/pythongermany/webserv:latest
+          tags: |
+            ${{ steps.meta.outputs.tags }}
+            latest
+            ${{ github.ref_name }}  # This will use the tag name if available
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max