diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4cbf1a64..dbf9e231 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,8 +1,6 @@
 name: Release new version
 
 on:
-  release:
-    types: [published]
   workflow_dispatch:
     inputs:
       tag_name:
@@ -10,8 +8,46 @@ on:
         required: true
 
 jobs:
+  bump-version:
+    runs-on: ubuntu-latest
+    env:
+      newVersion: ${{ github.event.inputs.tag_name }}
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Bump version in gradle.properties
+      run: |
+        newVersion=$(echo $newVersion | sed 's/^v//')
+        sed -i.bak "s/^version=.*/version=$newVersion/" gradle.properties
+        rm gradle.properties.bak
+
+    - name: Setup git config
+      run: |
+        git config user.name "GitHub Actions Bot"
+        git config user.email "<>"
+
+    - name: Commit version bump
+      run: |
+        git add gradle.properties
+        git commit -m "chore: Bump version to $newVersion"
+
+    - name: Tag version
+      run: |
+        git tag $newVersion
+
+    - name: Push changes
+      run: |
+        git push origin master
+        # Push tag
+        git push origin $newVersion
+
+
   build:
+    needs: bump-version
     uses: ./.github/workflows/build.yml
+    with:
+      branch: ${{ github.event.inputs.tag_name }}
 
   publish:
     runs-on: ubuntu-latest
@@ -20,7 +56,7 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
       with:
-        ref: ${{ github.event.release.tag_name || github.event.inputs.tag_name}}
+        ref: ${{ github.event.inputs.tag_name}}
     - name: Download uber-jar
       uses: actions/download-artifact@v4.1.7
       with:
@@ -36,6 +72,7 @@ jobs:
         file: ${{ needs.build.outputs.uber-jar }}
         tags: true
         draft: false
+        tag_name: ${{ github.event.inputs.tag_name }}
     - name: Deploy to Maven Central repository
       run: ./gradlew publish
       env: