diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 580c728c..509900e9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,118 +1,21 @@
 name: "Publish: manual full release OR automatic snapshot"
 
-on:
-  workflow_dispatch:
-    inputs:
-      releaseversion:
-        description: 'Release version'
-        required: true
-      nextversion:
-        description: 'Next dev version'
-        required: true
-  push:
-    branches:
-      - 'main'
+on: workflow_dispatch
 
 jobs:
-  setup:
-    runs-on: ubuntu-latest
-    outputs:
-      # Output project version from the POM to conditionally run dependent steps
-      project-version: ${{ steps.project_version.outputs.version }}
-    steps:
-      - name: Checkout latest code
-        uses: actions/checkout@v3
-
-      - name: Setup Java & Maven
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: 'temurin'
-          cache: 'maven'
-      
-      - name: Get project version from POM
-        id: project_version
-        run: echo "VERSION=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`" >> $GITHUB_OUTPUT
-
-  # Run only if project POM has version ending in "-SNAPSHOT"
-  snapshot:
-    needs: setup
-    if: github.event_name == 'push' && endsWith(needs.setup.outputs.project-version, '-SNAPSHOT')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout latest code
-        uses: actions/checkout@v3
-
-      - name: Setup Java & Maven
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: 'temurin'
-          cache: 'maven'
-          server-id: ossrh
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.MAVEN_GPG_KEY }}
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE
-
-      - name: Publish SNAPSHOT
-        run: mvn -B --no-transfer-progress clean deploy
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-
-  # Run for manual trigger (workflow dispatch), since you'll have release and next dev versions specified
-  # All commits will have a -SNAPSHOT project version anyway, since the releases will be handled here
-  release:
-    needs: setup
-    if: github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    env:
-      RELEASE: ${{ inputs.releaseversion }}
-      NEXT: ${{ inputs.nextversion }}
-    steps:
-      - name: Checkout latest code
-        uses: actions/checkout@v3
-
-      - name: Config git user
+  deploy_code:
+     runs-on: ubuntu-latest
+     steps:
+      - uses: actions/checkout@v2
+      - name: Check users available
         run: |
-          git config user.name ${{ github.actor }}
-          git config user.email "${{ github.actor }}@users.noreply.github.com"
+          echo "Using OSSRH_USERNAME ${{ secrets.OSSRH_USERNAME }}"
+          echo "Using GH_USER ${{ secrets.GH_USER }}"
 
-      - name: Setup Java & Maven
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: 'temurin'
-          cache: 'maven'
-          server-id: ossrh
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.MAVEN_GPG_KEY }}
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE
-      # =============================================================================
-      # Start the release
-      # =============================================================================
-      - name: Release main POM
+      - name: DRYRUN -- Release main POM
         run: |
-          mvn -B -U -V -ntp release:prepare -DreleaseVersion=$RELEASE -Dtag=$RELEASE -DdevelopmentVersion=$NEXT -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-          mvn -B -U -V -ntp release:perform -P release -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-
-      - name: Build and publish new dev version
-        run: mvn -B -U -V -ntp deploy -P release
+          mvn -B -U -V -ntp release:prepare -DdryRun=true -DreleaseVersion=0.001 -Dtag=0.001 -DdevelopmentVersion=0.002 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
         env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-
-      - name: Push release plugin commits
-        if: github.ref_type == 'branch' && github.ref_protected == false
-        run: git push origin ${{ github.ref_name }}
-
-      - name: Push new release tag GH
-        run: git push origin --tags
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAMEX }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORDX }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASEX }}