diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ea67856b..e9da0acf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,10 +3,10 @@ name: Publish Docker image for release
 on:
   release:
     types: [ created ]
-  push:
-    tags:
-      - "*.*.*"
-      - "!*-*"
+#  push:
+#    tags:
+#      - "*.*.*"
+#      - "!*-*"
 
 permissions:
   contents: read
@@ -37,13 +37,27 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Get draft release tag
+        if: ${{ github.event.release.draft == true }}
+        id: draft_tag
+        run: |
+          TAG=$(gh release view ${{ github.event.release.id }} --json tagName -q ".tagName")
+          echo "RELEASE_TAG=$TAG" >> $GITHUB_ENV
+
+
+#      - name: Publish GitHub Release
+#        if: ${{ github.event.release.draft == true }}
+#        env:
+#          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        #          gh release edit v${{ github.ref_name }} --draft=false
+#        run: |
+#          gh release edit ${{ github.event.release.id }} --draft=false
       - name: Publish GitHub Release
         if: ${{ github.event.release.draft == true }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        #          gh release edit v${{ github.ref_name }} --draft=false
         run: |
-          gh release edit ${{ github.event.release.id }} --draft=false
+          gh release edit $RELEASE_TAG --draft=false
 
   discord_notification:
     needs: docker_publish
diff --git a/.release-it.json b/.release-it.json
index 6bd22c9b..36eb86dd 100644
--- a/.release-it.json
+++ b/.release-it.json
@@ -7,10 +7,10 @@
   },
   "git": {
     "commit": true,
-    "commitMessage": "chore: release v${version}",
+    "commitMessage": "chore: release ${version}",
     "requireCleanWorkingDir": true,
     "tag": true,
-    "tagName": "v${version}",
+    "tagName": "${version}",
     "push": true
   },
   "plugins": {