diff --git a/.github/project.yml b/.github/project.yml
index a6217b4fd..76ecda583 100644
--- a/.github/project.yml
+++ b/.github/project.yml
@@ -1,4 +1,5 @@
 name: SmallRye Mutiny
 release:
+  previous-version: 2.6.2
   current-version: 2.7.0-RC3
   next-version: 999-SNAPSHOT
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
deleted file mode 100644
index 4cf371893..000000000
--- a/.github/workflows/pre-release.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: SmallRye Prepare Release
-
-on:
-  pull_request:
-    types: [ closed ]
-    paths:
-      - '.github/project.yml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  prepare-release:
-    name: Prepare Release
-    if: ${{ github.event.pull_request.merged == true}}
-    uses: smallrye/.github/.github/workflows/prepare-release.yml@main
-    secrets: inherit
\ No newline at end of file
diff --git a/justfile b/justfile
index 5c9da5016..28b285350 100755
--- a/justfile
+++ b/justfile
@@ -8,33 +8,43 @@ quick-build:
 verify:
     ./mvnw verify -Pparallel-tests -T8
 
-# Prepare a release pull-request branch
-prepare-release version:
-    @echo "🚀 Preparing a pull-request branch for releasing version {{version}}"
+# Prepare a release branch
+prepare-release previousVersion version:
+    @echo "🚀 Preparing a branch for releasing version {{version}}"
     git switch -c release/{{version}}
-    yq -i '.release.current-version = "{{version}}"'  .github/project.yml
+    yq -i '.release.current-version = "{{version}}"' .github/project.yml
+    yq -i '.release.previous-version = "{{previousVersion}}"' .github/project.yml
+    ./mvnw --batch-mode --no-transfer-progress versions:set -DnewVersion={{version}} -DgenerateBackupPoms=false
+    ./mvnw --batch-mode --no-transfer-progress versions:set -DnewVersion={{version}} -DgenerateBackupPoms=false -pl bom
     jbang .build/UpdateDocsAttributesFiles.java --mutiny-version={{version}}
     ./mvnw --batch-mode --no-transfer-progress -Pupdate-workshop-examples -f workshop-examples compile -DworkshopVersion={{version}}
     find workshop-examples -name '*.java' | xargs chmod +x
-    git commit -am "chore(release): update metadata for Mutiny {{version}}"
-    just clear-revapi
-    @echo "✅ All set, please review changes then open a pull-request from this branch!"
+    git commit -am "chore(release): update version metadata for Mutiny {{version}}"
+    @echo "✅ All set, please review the changes on this branch before doing the release, then:"
+    @echo "   - git push origin release/{{version}} --set-upstream"
+    @echo "   - just perform-release"
 
-# Use JReleaser to generate a changelog and announce a release
-jreleaser previousReleaseTag releaseTag:
+# Perform a release
+perform-release:
     #!/usr/bin/env bash
-    echo "🚀 Use JReleaser for the release of {{previousReleaseTag}} to {{releaseTag}}"
-    export CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+    export PREVIOUS_VERSION=$(yq '.release.previous-version' .github/project.yml)
+    export RELEASE_VERSION=$(yq '.release.current-version' .github/project.yml)
+    export NEXT_VERSION=$(yq '.release.next-version' .github/project.yml)
+    echo "🚀 Releasing with JReleaser: ${PREVIOUS_VERSION} ➡️ ${RELEASE_VERSION} ➡️ ${NEXT_VERSION}"
     export JRELEASER_GITHUB_TOKEN=$(gh auth token)
-    export JRELEASER_PROJECT_VERSION={{releaseTag}}
-    export JRELEASER_TAG_NAME={{releaseTag}}
-    export JRELEASER_PREVIOUS_TAG_NAME={{previousReleaseTag}}
-    echo "💡 Checking out tag {{releaseTag}}"
-    git checkout {{releaseTag}}
+    export JRELEASER_PROJECT_VERSION=${RELEASE_VERSION}
+    export JRELEASER_PREVIOUS_TAG_NAME=${PREVIOUS_VERSION}
+    echo "✅ JReleaser ok, preparing post-release commits"
     ./mvnw --batch-mode --no-transfer-progress -Pjreleaser jreleaser:full-release -pl :mutiny-project
-    echo "💡 Back to branch ${CURRENT_BRANCH}"
-    git checkout ${CURRENT_BRANCH}
-    echo "✅ JReleaser completed"
+    ./mvnw --batch-mode --no-transfer-progress versions:set -DnewVersion=${NEXT_VERSION} -DgenerateBackupPoms=false
+    ./mvnw --batch-mode --no-transfer-progress versions:set -DnewVersion=${NEXT_VERSION} -DgenerateBackupPoms=false -pl bom
+    git commit -am "chore(release): set development version to ${NEXT_VERSION}"
+    just clear-revapi
+    echo "✅ All set, don't forget to merge this branch and push upstream."
+    echo "💡 If you released from main:"
+    echo "      git switch main"
+    echo "      git merge release/${RELEASE_VERSION}"
+    echo "      git push --tags"
 
 # Clear RevAPI justifications
 clear-revapi:
@@ -44,7 +54,6 @@ clear-revapi:
       git add -A
       git status
       git commit -m "chore(release): clear RevAPI breaking change justifications"
-      git push
     else
       echo "No justifications cleared"
     fi
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b85e5d209..25a6f5a23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -575,7 +575,6 @@
                                         <name>smallrye-mutiny</name>
                                         <enabled>true</enabled>
                                         <overwrite>true</overwrite>
-                                        <skipTag>true</skipTag>
                                         <changelog>
                                             <preset>conventional-commits</preset>
                                             <links>true</links>