diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c336e923..04537a48 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,8 +54,8 @@ jobs:
             --use-wrapper \
             --uses-plugin \
             --deploy-ivy-desc=false \
-            --server-id-resolve spring-cloud \
-            --server-id-deploy spring-cloud \
+            --server-id-resolve=${{ vars.JF_SERVER_ID }} \
+            --server-id-deploy=${{ vars.JF_SERVER_ID }} \
             --repo-resolve snapshot \
             --repo-deploy snapshot
           echo JFROG_CLI_BUILD_NAME=spring-shell-33x >> $GITHUB_ENV
diff --git a/.github/workflows/release-ga.yml b/.github/workflows/release-ga.yml
index bdc19948..bf2b96d4 100644
--- a/.github/workflows/release-ga.yml
+++ b/.github/workflows/release-ga.yml
@@ -29,8 +29,8 @@ jobs:
           --use-wrapper \
           --uses-plugin \
           --deploy-ivy-desc=false \
-          --server-id-resolve spring-cloud \
-          --server-id-deploy spring-cloud \
+          --server-id-resolve=${{ vars.JF_SERVER_ID }} \
+          --server-id-deploy=${{ vars.JF_SERVER_ID }} \
           --repo-resolve release \
           --repo-deploy libs-staging-local
         echo JFROG_CLI_BUILD_NAME=spring-shell-33x-release >> $GITHUB_ENV
diff --git a/.github/workflows/release-milestone.yml b/.github/workflows/release-milestone.yml
index fbfaaa7c..50790fc9 100644
--- a/.github/workflows/release-milestone.yml
+++ b/.github/workflows/release-milestone.yml
@@ -32,8 +32,8 @@ jobs:
           --use-wrapper \
           --uses-plugin \
           --deploy-ivy-desc=false \
-          --server-id-resolve spring-cloud \
-          --server-id-deploy spring-cloud \
+          --server-id-resolve=${{ vars.JF_SERVER_ID }} \
+          --server-id-deploy=${{ vars.JF_SERVER_ID }} \
           --repo-resolve milestone \
           --repo-deploy libs-staging-local
         echo JFROG_CLI_BUILD_NAME=spring-shell-33x-milestone >> $GITHUB_ENV