diff --git a/.github/workflows/build_and_publish_docker_image.yml b/.github/workflows/build_and_publish_docker_image.yml
index 3c4cd9e..1dfe271 100644
--- a/.github/workflows/build_and_publish_docker_image.yml
+++ b/.github/workflows/build_and_publish_docker_image.yml
@@ -19,15 +19,23 @@ jobs:
         with:
           generate_release_notes: true
 
+      - name: Calculate final Docker image name
+        id: docker_image_name
+        run: |
+          IMAGE_NAME="${{ github.repository }}"
+          FINAL_NAME="${IMAGE_NAME/_Docker/}"
+          echo "value=$FINAL_NAME" >> $GITHUB_OUTPUT
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: |
-            ${{ github.repository | replace('_Docker', '') }}
-            ghcr.io/${{ github.repository | replace('_Docker', '') }}
+            ${{ steps.docker_image_name.outputs.value }} # docker.io/tigerblue77/dell_idrac_fan_controller
+            ghcr.io/${{ steps.docker_image_name.outputs.value }} # ghcr.io/tigerblue77/dell_idrac_fan_controller
           tags: |
             type=ref,event=tag
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
           flavor: |
             latest=auto