diff --git a/.github/workflows/ci-publish.yml b/.github/workflows/ci-publish.yml
index 8433a273..d412f272 100644
--- a/.github/workflows/ci-publish.yml
+++ b/.github/workflows/ci-publish.yml
@@ -30,7 +30,7 @@ jobs:
           --server-id-deploy repo.spring.io \
           --repo-deploy-releases release \
           --repo-deploy-snapshots snapshot
-        echo JFROG_CLI_BUILD_NAME=spring-shell-main >> $GITHUB_ENV
+        echo JFROG_CLI_BUILD_NAME=spring-shell-21x >> $GITHUB_ENV
         echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
     - name: Build and Publish
       env:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 61dab0a8..28d15a51 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,6 +38,6 @@ jobs:
     if: github.repository_owner == 'spring-projects'
     needs: [build]
     name: Call Publish Snapshot
-    uses: spring-projects/spring-shell/.github/workflows/ci-publish.yml@main
+    uses: spring-projects/spring-shell/.github/workflows/ci-publish.yml@2.1.x
     secrets:
       jfArtifactorySpring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
diff --git a/.github/workflows/next-dev-version.yml b/.github/workflows/next-dev-version.yml
index f3fbd2da..6b1a7d67 100644
--- a/.github/workflows/next-dev-version.yml
+++ b/.github/workflows/next-dev-version.yml
@@ -36,5 +36,5 @@ jobs:
     - name: Commit Next Dev Changes
       uses: jvalkeal/build-zoo-handler@v0.0.4
       with:
-        commit-changes-branch: main
+        commit-changes-branch: 2.1.x
         commit-changes-message: Next development version
diff --git a/.github/workflows/release-ga.yml b/.github/workflows/release-ga.yml
index 634720b2..6ad9bf29 100644
--- a/.github/workflows/release-ga.yml
+++ b/.github/workflows/release-ga.yml
@@ -27,7 +27,7 @@ jobs:
           --server-id-deploy=repo.spring.io \
           --repo-deploy-releases=libs-staging-local \
           --repo-deploy-snapshots=libs-staging-local
-        echo JFROG_CLI_BUILD_NAME=spring-shell-main-release >> $GITHUB_ENV
+        echo JFROG_CLI_BUILD_NAME=spring-shell-21x-release >> $GITHUB_ENV
         echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
     - name: Configure GA Version
       run: |
@@ -85,7 +85,7 @@ jobs:
           --server-id-deploy=repo.spring.io \
           --repo-deploy-releases=libs-staging-local \
           --repo-deploy-snapshots=libs-staging-local
-        echo JFROG_CLI_BUILD_NAME=spring-shell-main-release >> $GITHUB_ENV
+        echo JFROG_CLI_BUILD_NAME=spring-shell-21x-release >> $GITHUB_ENV
         echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
     - name: Promote Build
       run: |
@@ -161,7 +161,7 @@ jobs:
         JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |
-        echo JFROG_CLI_BUILD_NAME=spring-shell-main-release >> $GITHUB_ENV
+        echo JFROG_CLI_BUILD_NAME=spring-shell-21x-release >> $GITHUB_ENV
         echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
     - name: Download Release Files
       run: |
diff --git a/.github/workflows/release-milestone.yml b/.github/workflows/release-milestone.yml
index 759e6bd3..b9bfd125 100644
--- a/.github/workflows/release-milestone.yml
+++ b/.github/workflows/release-milestone.yml
@@ -31,7 +31,7 @@ jobs:
           --server-id-deploy=repo.spring.io \
           --repo-deploy-releases=libs-staging-local \
           --repo-deploy-snapshots=libs-staging-local
-        echo JFROG_CLI_BUILD_NAME=spring-shell-main-milestone >> $GITHUB_ENV
+        echo JFROG_CLI_BUILD_NAME=spring-shell-21x-milestone >> $GITHUB_ENV
         echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
     - name: Configure Milestone Version
       run: |
@@ -89,7 +89,7 @@ jobs:
           --server-id-deploy=repo.spring.io \
           --repo-deploy-releases=libs-staging-local \
           --repo-deploy-snapshots=libs-staging-local
-        echo JFROG_CLI_BUILD_NAME=spring-shell-main-milestone >> $GITHUB_ENV
+        echo JFROG_CLI_BUILD_NAME=spring-shell-21x-milestone >> $GITHUB_ENV
         echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
     - name: Promote Build
       run: |