diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 13c0c4f..56489f2 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -31,7 +31,6 @@ jobs:
           major_pattern: "(MAJOR)"
           minor_pattern: "(MINOR)"
           version_format: "${major}.${minor}.${patch}-rc${increment}"
-          user_format_type: "csv"
           bump_each_commit: false
           search_commit_body: true
 
@@ -49,6 +48,7 @@ jobs:
         with:
           fromTag: v${{ steps.versioning.outputs.previous_version }}
           toTag: ${{ steps.tag_version.outputs.new_tag }}
+          fetchReviewers: true
 
       - name: Create production release
         uses: ncipollo/release-action@v1
@@ -58,17 +58,5 @@ jobs:
           name: ${{ steps.versioning.outputs.version_tag }}
           body: ${{ steps.changelog.outputs.changelog }}
           draft: false
-          prerelease: false
+          prerelease: true
           commit: ${{ steps.versioning.outputs.current_commit }}
-
-      - name: Update CHANGELOG & update develop branch
-        run: |
-          git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
-          git config --global user.email "${{ env.CI_COMMIT_AUTHOR }}"
-          changelog='${{ steps.changelog.outputs.changelog }}'
-          escaped_changelog=$(printf '%s\n' "$changelog" | sed 's/\\/&&/g;s/^[[:blank:]]/\\&/;s/$/\\/')
-          sed -i "2i ${escaped_changelog%?}" CHANGELOG.md
-          sed -i "2i ## ${{ steps.versioning.outputs.version_tag }} - $(date +'%d-%m-%Y')" CHANGELOG.md
-          git add -A && git commit -m "chore(docs): update CHANGELOG.MD"
-          git push origin main
-          git push --force origin main:develop
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..5394a79
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,62 @@
+name: Main
+
+on:
+  push:
+    branches:
+      - main
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  CI_COMMIT_MESSAGE: Deployment by CI
+  CI_COMMIT_AUTHOR: ci@acmesoftware.com
+
+jobs:
+  dev:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Perform semantic version
+        uses: paulhatch/semantic-version@v5.4.0
+        id: versioning
+        with:
+          tag_prefix: "v"
+          major_pattern: "(MAJOR)"
+          minor_pattern: "(MINOR)"
+          version_format: "${major}.${minor}.${patch}-rc${increment}"
+          bump_each_commit: false
+          search_commit_body: true
+
+      - name: Bump version and push tag
+        id: tag_version
+        uses: mathieudutour/github-tag-action@v6.2
+        with:
+          custom_tag: ${{ steps.versioning.outputs.version_tag }}
+          tag_prefix: ""
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Changelog
+        id: changelog
+        uses: mikepenz/release-changelog-builder-action@v5
+        with:
+          fromTag: v${{ steps.versioning.outputs.previous_version }}
+          toTag: ${{ steps.tag_version.outputs.new_tag }}
+          fetchReviewers: true
+
+      - name: Create production release
+        uses: ncipollo/release-action@v1
+        id: release
+        with:
+          tag: ${{ steps.tag_version.outputs.new_tag }}
+          name: ${{ steps.versioning.outputs.version_tag }}
+          body: ${{ steps.changelog.outputs.changelog }}
+          draft: false
+          prerelease: false
+          commit: ${{ steps.versioning.outputs.current_commit }}
diff --git a/.github/workflows/pr-version.yml b/.github/workflows/pr-version.yml
new file mode 100644
index 0000000..0c27d84
--- /dev/null
+++ b/.github/workflows/pr-version.yml
@@ -0,0 +1,41 @@
+on:
+  pull_request_target:
+    types:
+      - opened
+    branches:
+      - main
+      - develop
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  pr-version:
+    runs-on: ubuntu-latest
+
+    permissions:
+      pull-requests: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: "refs/pull/${{ github.event.number }}/merge"
+          fetch-depth: 0
+
+      - name: Perform semantic version
+        uses: paulhatch/semantic-version@v5.4.0
+        id: versioning
+        with:
+          tag_prefix: "v"
+          major_pattern: "(MAJOR)"
+          minor_pattern: "(MINOR)"
+          version_format: "${major}.${minor}.${patch}-rc${increment}"
+          bump_each_commit: false
+          search_commit_body: true
+
+      - name: Comment PR
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          message: |
+            :rocket: The next version will be **${{ steps.versioning.outputs.version_tag }}** ! :rocket:
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 39a5c90..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1 +0,0 @@
-# CHANGELOG.md
\ No newline at end of file