diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e464a9a8..fb80e630f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -105,20 +105,51 @@ jobs:
         name: PluginLoader
         path: dist
 
-    - name: Bump version and push tag ⏫
+    - name: Bump version ⏫
       id: tag_version
       uses: mathieudutour/github-tag-action@v6.0
+      if: ${{ github.event_name == 'workflow_dispatch' }}
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        release_branches: ''
-        pre_release_branches: 'main'
-        append_to_pre_release_tag: '-pre'
+        dry_run: true
+
+    - name: Push tag ⏫
+      uses: rickstaa/action-create-tag@v1.3.2
+      if: ${{ steps.tag_version.outputs.new_tag && github.event_name == 'workflow_dispatch' }}
+      with:
+        tag: ${{ steps.tag_version.outputs.new_tag }}-pre
+        message: Nightly ${{ steps.tag_version.outputs.new_tag }}
 
     - name: Release 📦
       uses: softprops/action-gh-release@v1
+      if: ${{ github.event_name == 'workflow_dispatch' }}
       with:
         name: Nightly ${{ steps.tag_version.outputs.new_tag }}
-        tag_name: ${{ steps.tag_version.outputs.new_tag }}
+        tag_name: ${{ steps.tag_version.outputs.new_tag }}-pre
+        files: ./dist/PluginLoader
+        prerelease: true
+        generate_release_notes: true
+
+    - name: Bump prerelease
+      id: bump
+      if: ${{ github.event_name == 'schedule' }}
+      run: |
+        git_hash=$(git rev-parse --short "$GITHUB_SHA")
+        echo ::set-output new_tag="nightly-$git_hash"
+
+    - name: Push tag ⏫
+      uses: rickstaa/action-create-tag@v1.3.2
+      if: ${{ github.event_name == 'schedule' }}
+      with:
+        tag: ${{ steps.bump.outputs.new_tag }}
+        message: Nightly ${{ steps.bump.outputs.new_tag }}
+
+    - name: Release 📦
+      uses: softprops/action-gh-release@v1
+      if: ${{ github.event_name == 'schedule' }}
+      with:
+        name: Nightly ${{ steps.bump.outputs.new_tag }}
+        tag_name: ${{ steps.bump.outputs.new_tag }}
         files: ./dist/PluginLoader
         prerelease: true
         generate_release_notes: true