diff --git a/.github/workflows/apps-plugin-next-dev-version.yml b/.github/workflows/apps-plugin-next-dev-version.yml
index bad9ba85..54694dcf 100644
--- a/.github/workflows/apps-plugin-next-dev-version.yml
+++ b/.github/workflows/apps-plugin-next-dev-version.yml
@@ -37,8 +37,8 @@ jobs:
       - name: Configure JFrog Cli
         run: |
           jfrog rt mvnc \
-            --server-id-resolve=repo.spring.io \
-            --server-id-deploy=repo.spring.io \
+            --server-id-resolve=${{ vars.JF_SERVER_ID }} \
+            --server-id-deploy=${{ vars.JF_SERVER_ID }} \
             --repo-resolve-releases=libs-milestone \
             --repo-resolve-snapshots=libs-snapshot \
             --repo-deploy-releases=libs-milestone-local \
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index 59bfe63b..2c917f05 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -689,6 +689,8 @@ jobs:
           JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Configure JFrog Cli
         shell: bash
+        env:
+          JF_SERVER_ID: ${{ vars.JF_SERVER_ID }}
         run: |
           ./configure-jfrog.sh ${{ needs.parameters.outputs.build_version_type }}          
           echo JFROG_CLI_BUILD_NAME=stream-apps-main-release >> $GITHUB_ENV
diff --git a/configure-jfrog.sh b/configure-jfrog.sh
index 00893576..49507023 100755
--- a/configure-jfrog.sh
+++ b/configure-jfrog.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 MVNC=
+readonly JF_SERVER_ID=${JF_SERVER_ID:-spring-cloud}
 case $1 in
-"ga")
-  MVNC="--server-id-resolve=repo.spring.io --server-id-deploy=repo.spring.io --repo-resolve-releases=libs-release --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-staging-local --repo-deploy-snapshots=libs-snapshot-local"
+"ga" | "release")
+  MVNC="--server-id-resolve=${JF_SERVER_ID} --server-id-deploy=${JF_SERVER_ID} --repo-resolve-releases=libs-release --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-staging-local --repo-deploy-snapshots=libs-snapshot-local"
   ;;
 "milestone")
-  MVNC="--server-id-resolve=repo.spring.io --server-id-deploy=repo.spring.io --repo-resolve-releases=libs-milestone --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-milestone-local --repo-deploy-snapshots=libs-snapshot-local"
+  MVNC="--server-id-resolve=${JF_SERVER_ID} --server-id-deploy=${JF_SERVER_ID} --repo-resolve-releases=libs-milestone --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-milestone-local --repo-deploy-snapshots=libs-snapshot-local"
   ;;
 "snapshot")
-  MVNC="--server-id-resolve=repo.spring.io --server-id-deploy=repo.spring.io --repo-resolve-releases=libs-snapshot --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-milestone-local --repo-deploy-snapshots=libs-snapshot-local"
+  MVNC="--server-id-resolve=${JF_SERVER_ID} --server-id-deploy=${JF_SERVER_ID} --repo-resolve-releases=libs-snapshot --repo-resolve-snapshots=libs-snapshot --repo-deploy-releases=libs-milestone-local --repo-deploy-snapshots=libs-snapshot-local"
   ;;
 *)
   echo "Invalid build type $1"