diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 8c0d902f7..4b80c0260 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -23,34 +23,33 @@ jobs:
           java-package: jdk
           architecture: x64
 
-      - name: avoid release loop
-        run: scripts/avoid-release-loop.sh
-        env:
-          GIT_RELEASE_BOT_NAME: "nb-droid"
-
-      - name: capture tty for gpg
-        run: |
-          echo "TTY="$(tty) >> $GITHUB_ENV
-          echo "GPG_TTY="$(tty) >> $GITHUB_ENV
-          # echo "::set-env name=TTY::"$(tty)
-          # echo "::set-env name=GPG_TTY::"$(tty)
-
-      - name: initialize gpg
-        run: |
-          set -x
-          echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key
-          gpg --import --batch ./private.key
-          rm ./private.key
-          echo "gnupg files:"
-          ls -l ~/.gnupg/
-
+#      - name: avoid release loop
+#        run: scripts/avoid-release-loop.sh
+#        env:
+#          GIT_RELEASE_BOT_NAME: "nb-droid"
+#
+#      - name: capture tty for gpg
+#        run: |
+#          echo "TTY="$(tty) >> $GITHUB_ENV
+#          echo "GPG_TTY="$(tty) >> $GITHUB_ENV
+#          # echo "::set-env name=TTY::"$(tty)
+#          # echo "::set-env name=GPG_TTY::"$(tty)
+#
+#      - name: initialize gpg
+#        run: |
+#          set -x
+#          echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key
+#          gpg --import --batch ./private.key
+#          rm ./private.key
+#          echo "gnupg files:"
+#          ls -l ~/.gnupg/
+#
       - name: set git username
         run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
 
       - name: set git email
         run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
 
-
       - name: free disk space
         run: |
           sudo swapoff -a
@@ -69,20 +68,12 @@ jobs:
       - name: read versions
         run: |
           set -x
-          CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-          RELEASE_VERSION=${CURRENT_VERSION%%-SNAPSHOT}
-          BASE_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f1-2)
-          MINOR_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f3)
-          NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
-          NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
-          RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
-          echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
-          echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV
-          echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
-          echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV
-          # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
-          # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
-          # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
+          PRERELEASE_REVISION=$(scripts/get-prerelease-revision.sh)
+          echo "PRERELEASE_REVISION=${{PRERELEASE_REVISION}}" >> $GITHUB_ENV
+
+      - name: tag prerelease
+        run: |
+          git tag ${{ env.PRERELEASE_REVISION }}
 
       - name: prepare release summary
         id: prepare_summary
@@ -96,32 +87,12 @@ jobs:
 
       - name: select release type from branch name
         run: |
-          current_branch=$(git rev-parse --abbrev-ref HEAD)
-          if [[ ${current_branch} == *"nb4-maintenance"* ]]
-           then
-            echo "PRERELEASE=false" >> $GITHUB_ENV
-            echo "DOCKER_TAGS=nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:4x,nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
-           else
             echo "PRERELEASE=true" >> $GITHUB_ENV
-            echo "DOCKER_TAGS=nosqlbench/nosqlbench:nb5preview,nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
-          fi
+            echo "DOCKER_TAGS=nosqlbench/nosqlbench:latest-prerelease,nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}-prerelease" >> $GITHUB_ENV
 
-      - name: prepare Maven release
-        run: scripts/release-prepare.sh
-        env:
-          RELEASE_BRANCH_PATTERN: "nb4-maintenance"
-          PRERELEASE_BRANCH_PATTERN: "main"
-          GIT_RELEASE_BOT_NAME: "nb-droid"
-          GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
-          ACCESS_TOKEN: ${{ secrets.NBDROID_TOKEN }}
-          GPG_ENABLED: "true"
-          GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
-          GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
-          GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
-          MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
-          MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
+      - name: build prerelease revision
+        run: |
+          mvn package -Drevision="${{ env.PRERELEASE_REVISION }}"
 
       - name: generate javadoc
         run: mvn javadoc:aggregate-jar
@@ -163,24 +134,6 @@ jobs:
 #          name: itlogs
 #          path: itlogs
 
-      - name: perform Maven release
-        run: scripts/release-perform.sh
-        continue-on-error: true
-        env:
-          RELEASE_BRANCH_PATTERN: "nb4-maintenance"
-          PRERELEASE_BRANCH_PATTERN: "main"
-          GIT_RELEASE_BOT_NAME: "nb-droid"
-          GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
-          ACCESS_TOKEN: ${{ secrets.NBDROID_TOKEN }}
-          GPG_ENABLED: "true"
-          GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
-          GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
-          GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
-          MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
-          MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
-
       - name: bundle artifacts
         run: |
           pwd
@@ -212,26 +165,16 @@ jobs:
           push: true
           tags: ${{ env.DOCKER_TAGS }}
 
-#      - name: bundle guidebook
-#        run: mkdir guidebook && cp -R nb/target/guidebook guidebook
-#
-#      - name: upload guidebook
-#        uses: actions/upload-artifact@v1
-#        with:
-#          name: guidebook
-#          path: guidebook
-#
-
       - name: create github release
         id: create_github_release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ env.RELEASE_TAGNAME }}
-          release_name: Release ${{ env.RELEASE_TAGNAME }}
+          tag_name: ${{ env.PRERELEASE_REVISION }}
+          release_name: Release ${{ env.PRERELEASE_REVISION }}
           draft: false
-          prerelease: ${{ env.PRERELEASE }}
+          prerelease: true
           body: ${{ steps.prepare_summary.outputs.release_summary }}
 
       - name: upload nb.jar to github release
diff --git a/scripts/release-revision.sh b/scripts/release-revision.sh
index 0779110de..e1b66c5c6 100755
--- a/scripts/release-revision.sh
+++ b/scripts/release-revision.sh
@@ -22,40 +22,3 @@ export REVISION=$(mvn help:evaluate -Dexpression=revision -q -DforceStdout)
 export PRERELEASE_REVISION=$(echo "${REVISION}" | cut -d'-' -f1)
 printf "REVISION: '%s'  PRERELEASE_REVISION: '%s'\n" "${REVISION}" "${PRERELEASE_REVISION}"
 mvn package -Drevision="${PRERELEASE_REVISION}"
-exit
-
-GIT_RELEASE_BOT_NAME=${GIT_RELEASE_BOT_NAME:?GIT_RELEASE_BOT_NAME must be provided}
-GITHUB_SHA=${GITHUB_SHA:?GITHUB_SHA must be provided}
-GITHUB_REF=${GITHUB_REF:?GITHUB_REF must be provided}
-RELEASE_BRANCH_PATTERN=${RELEASE_BRANCH_PATTERN:?RELEASE_BRANCH_PATTERN must be provided}
-PRERELEASE_BRANCH_PATTERN=${PRERELEASE_BRANCH_PATTERN:?PRERELEASE_BRANCH_PATTERN must be provided}
-
-#git rev-parse --abbrev-ref HEAD
-
-# Filter the branch to execute the release on
-readonly local current_branch=$(git rev-parse --abbrev-ref HEAD)
-echo "Current branch: ${current_branch}"
-
-if   [[ -n "${current_branch}" && "${current_branch}" == *"${RELEASE_BRANCH_PATTERN}"* ]]; then
-    echo "Building for release branch ${current_branch}"
-elif [[ -n "${current_branch}" && "${current_branch}" == *"${PRERELEASE_BRANCH_PATTERN}"* ]]; then
-    echo "Building prerelease for branch ${current_branch}"
-else
-     echo "Skipping for ${current_branch} branch"
-     exit 0
-fi
-
-# Making sure we are on top of the branch
-echo "Git checkout branch ${GITHUB_REF##*/}"
-git checkout ${GITHUB_REF##*/}
-echo "Git reset hard to ${GITHUB_SHA}"
-git reset --hard ${GITHUB_SHA}
-
-# Do the release
-echo "Do mvn release:prepare..."
-#mvn $MAVEN_REPO_LOCAL --batch-mode --global-settings release.xml -Dusername=$GITHUB_ACCESS_TOKEN release:prepare
-mvn --batch-mode --global-settings release.xml -Dusername=$GITHUB_ACCESS_TOKEN clean release:prepare -DdevelopmentVersion=${NEXT_SNAPSHOT} -DreleaseVersion=${RELEASE_VERSION}
-
-echo "files after release:prepare..."
-pwd
-ls -l