diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 30589e9..a610e01 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -1,38 +1,27 @@
-name: Tag
+# example 2: on merge to master from pull request (recommended)
+name: Bump version
 on:
-  push:
+  pull_request:
+    types:
+      - closed
     branches:
       - master
+
 jobs:
-  tag-master:
-    runs-on: ubuntu-latest
+  build:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: write
     steps:
-    - uses: actions/checkout@v4
-    - name: tag
-      uses: ./.github/actions/git-tags
-      env:
-        VERSION: "${GITHUB_WORKSPACE}/.release"
-        # must be a user token in order to trigger the release flow
-        GITHUB_TOKEN: ${{ secrets.USER_GITHUB_TOKEN }}
-    - name: bumpver
-      uses: ./.github/actions/bumpver
-    - name: auto-commit
-      uses: ./.github/actions/auto-commit
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        args: This is an auto-commit
-    - name: generate-tagged-changelog
-      uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
-      env:
-        CHANGELOG_GITHUB_TOKEN: ${{ secrets.CHANGELOG_GITHUB_TOKEN }}
-        SRC_PATH: /github/workspace
-      with:
-        args: -u gabeduke -p level --release-branch master
-    - name: push-changelog
-      uses: docker://whizark/chandler
-      env:
-        CHANDLER_GITHUB_API_TOKEN: ${{ secrets.CHANDLER_GITHUB_API_TOKEN }}
-        CHANDLER_WORKDIR: /github/workspace
-      with:
-        args: push
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
+          fetch-depth: '0'
+
+      - name: Bump version and push tag
+        uses: anothrNick/github-tag-action@v1 # Don't use @master or @v1 unless you're happy to test the latest version
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # if you don't want to set write permissions use a PAT token
+          TAG_PREFIX: v
+          PRERELEASE: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 463c991..3a853d4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,22 +1,26 @@
 on:
-  create:
-    tags: "*"
-name: Release
+  push:
+    tags:
+      - '*'
+
 jobs:
-  created-filter:
+  release:
+    if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: generate-release-changelog
-      uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
-      env:
-        CHANGELOG_GITHUB_TOKEN: ${{ secrets.CHANGELOG_GITHUB_TOKEN }}
-        SRC_PATH: /github/workspace
-      with:
-        args: -u gabeduke -p level --release-branch master
-    - name: goreleaser
-      uses: docker://goreleaser/goreleaser
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        args: release --release-notes=/github/workspace/CHANGELOG.md
+      - name: Build Changelog
+        id: github_release
+        uses: mikepenz/release-changelog-builder-action@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Release
+        uses: mikepenz/action-gh-release@v0.2.0-a03 #softprops/action-gh-release
+        with:
+          body: ${{steps.github_release.outputs.changelog}}
+      - name: goreleaser
+        uses: docker://goreleaser/goreleaser
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: release --release-notes=/github/workspace/CHANGELOG.md