diff --git a/.cz.toml b/.cz.toml
index f033b5b67..134eb4e72 100644
--- a/.cz.toml
+++ b/.cz.toml
@@ -1,7 +1,7 @@
 [tool.commitizen]
 name = "cz_conventional_commits"
-tag_format = "$version"
+tag_format = "v$version"
 version_scheme = "semver"
-version = "0.7.0"
+version = "v0.1.0"
 update_changelog_on_bump = true
 major_version_zero = true
diff --git a/.github/workflows/tag-on-merge.yml b/.github/workflows/tag-on-merge.yml
index f1d4ca9ce..5c6df7167 100644
--- a/.github/workflows/tag-on-merge.yml
+++ b/.github/workflows/tag-on-merge.yml
@@ -11,19 +11,28 @@ permissions:
   contents: write
 
 jobs:
-  build:
+  create_release_tag:
     if: github.event.pull_request.merged == true
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: write
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.pull_request.merge_commit_sha }}
-          fetch-depth: "0"
+          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
-          WITH_V: true
+      - name: Install Commitizen
+        run: pip install commitizen
+
+      - name: Determine next version
+        id: version
+        run: |
+          next_version=$(cz bump --dry-run)
+          echo "Next version: $next_version"
+          echo "NEW_VERSION=$next_version" >> $GITHUB_ENV
+
+      - name: Create and push tag
+        run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git tag -a "release/${{ env.NEW_VERSION }}" -m "Release ${{ env.NEW_VERSION }}"
+          git push origin "release/${{ env.NEW_VERSION }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa1869be8..ce8c0af30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.7.0 (2024-09-05)
+## 0.1.0 (2024-09-05)
 
 ### Feat
 
@@ -79,7 +79,7 @@
 - remove unused FileSystem interface
 - remove unused functions and types
 - update AssetInfo protobuf definition
-- add  field to
+- add field to
 - Update KeyKind Enum to have proper naming conventions
 - Update `DIDNamespace` to have proper naming convention
 - expose ports directly in docker-compose