diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 8383231..c6d615d 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -35,6 +35,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      # Extract version from tag if present
+      - name: Extract version from tag
+        id: tag_version
+        run: |
+          if [[ $GITHUB_REF == refs/tags/v* ]]; then
+            echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+            echo "Using version tag: ${GITHUB_REF#refs/tags/}"
+          else
+            echo "VERSION=latest" >> $GITHUB_OUTPUT
+            echo "No version tag, using 'latest'"
+          fi
+
       - uses: docker/build-push-action@v5
         with:
           context: .
@@ -42,4 +54,5 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
-            ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ github.sha }}
\ No newline at end of file
+            ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ github.sha }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ steps.tag_version.outputs.VERSION }}
\ No newline at end of file