diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 910625209107b887585aead07168f3ce1e93d324..e44822614d7f018c3f7c639a65d8730f19fd353a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,24 +26,18 @@ jobs:
         with:
           go-version: "1.24" # Match the Go version in go.mod
 
-      - name: Fetch all tags
-        run: git fetch --force --tags
-
-      - name: Automatic Tagging
-        id: conventional-commits
-        uses: webiny/action-conventional-commits@v1.3.0
+      - name: Bump version and push tag
+        id: tag_version
+        uses: mathieudutour/github-tag-action@v6.1
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Fetch all tags x2
-        run: git fetch --force --tags
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run GoReleaser
-        if: steps.conventional-commits.outputs.tag
+        if: steps.tag_version.outputs.new_tag
         uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
-          args: release --clean
+          args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}