diff --git a/.github/workflows/service_docker-build-and-publish.yml b/.github/workflows/service_docker-build-and-publish.yml
index f9883c9..d42acef 100644
--- a/.github/workflows/service_docker-build-and-publish.yml
+++ b/.github/workflows/service_docker-build-and-publish.yml
@@ -36,12 +36,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: "📦 Assemble the Docker Tags"
-        run: |
-          bash build.sh \
-            --release-type ${{ inputs.release_type }} \
-            --print-tags-only
-
       - name: Set REPOSITORY_BUILD_VERSION
         id: set_version
         run: |
@@ -54,6 +48,19 @@ jobs:
             echo "REPOSITORY_BUILD_VERSION=git-${SHORT_SHA}-${{ github.run_id }}" >> $GITHUB_ENV
           fi
 
+      - name: "📦 Assemble the Docker Tags"
+        run: |
+          if [ "${{ github.ref_type }}" == "tag" ]; then
+            bash build.sh \
+              --release-type ${{ inputs.release_type }} \
+              --version ${{ github.ref_name }} \
+              --print-tags-only
+          else
+            bash build.sh \
+              --release-type ${{ inputs.release_type }} \
+              --print-tags-only
+          fi
+
       - name: Build and push
         uses: docker/build-push-action@v6
         with: