diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3b2b4604..98785ceb 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,9 +2,9 @@ version: 2
 registries:
   spring-commercial:
     type: maven-repository
-    url: https://repo.spring.vmware.com/artifactory/spring-commercial
-    username: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }}
-    password: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }}
+    url: https://repo.spring.io/artifactory/spring-commercial-release-remote-cache
+    username: ${{ secrets.ARTIFACTORY_RO_USERNAME }}
+    password: ${{ secrets.ARTIFACTORY_RO_PASSWORD }}
 
 updates:
 
diff --git a/.github/workflows/ci-snapshot.yml b/.github/workflows/ci-snapshot.yml
index 114f8df8..dc1f965f 100644
--- a/.github/workflows/ci-snapshot.yml
+++ b/.github/workflows/ci-snapshot.yml
@@ -15,7 +15,7 @@ jobs:
   build-snapshot:
     uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-snapshot.yml@main
     with:
-      artifactoryUrl: https://usw1.packages.broadcom.com
+      artifactoryUrl: ${{ secrets.COMMERCIAL_ARTIFACTORY_URL }}
       targetRepository: spring-enterprise-maven-dev-local
       artifactoryProjectKey: spring
       runner: ubuntu22-2-8
diff --git a/.github/workflows/distribute-spring-enterprise.yml b/.github/workflows/distribute-spring-enterprise.yml
index 1cfac128..9cb1c083 100644
--- a/.github/workflows/distribute-spring-enterprise.yml
+++ b/.github/workflows/distribute-spring-enterprise.yml
@@ -18,7 +18,7 @@ jobs:
   distribute-release-to-spring-enterprise:
     uses: spring-io/spring-github-workflows/.github/workflows/spring-enterprise-release-bundle.yml@main
     with:
-      artifactoryUrl: https://usw1.packages.broadcom.com
+      artifactoryUrl: ${{ secrets.COMMERCIAL_ARTIFACTORY_URL }}
       bundleName: TNZ-${{ github.event.repository.name }}
       releaseVersion: ${{ inputs.releaseVersion }}
       buildName: ${{ inputs.buildName }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ecac331b..e499882c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
 
     uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@main
     with:
-      artifactoryUrl: https://usw1.packages.broadcom.com
+      artifactoryUrl: ${{ secrets.COMMERCIAL_ARTIFACTORY_URL }}
       stagingRepository: spring-enterprise-maven-stage-local
       targetReleaseRepository: spring-enterprise-maven-prod-local
       artifactoryProjectKey: spring
diff --git a/.github/workflows/verify-staged-artifacts.yml b/.github/workflows/verify-staged-artifacts.yml
index 003d79a0..bc1b8680 100644
--- a/.github/workflows/verify-staged-artifacts.yml
+++ b/.github/workflows/verify-staged-artifacts.yml
@@ -11,6 +11,7 @@ on:
 env:
   ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
   ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
+  ARTIFACTORY_URL: ${{ secrets.COMMERCIAL_ARTIFACTORY_URL }}
 
 jobs:
   verify-staged-with-samples:
@@ -32,7 +33,7 @@ jobs:
           printf "allprojects {
                   repositories {
                     maven { 
-                      url 'https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-stage-local'
+                      url '$ARTIFACTORY_URL/artifactory/spring-enterprise-maven-stage-local'
                       credentials {
                         username = '$ARTIFACTORY_USERNAME'
                         password = '$ARTIFACTORY_PASSWORD'
diff --git a/commercial-settings.gradle b/commercial-settings.gradle
index 8b590460..67ea67e0 100644
--- a/commercial-settings.gradle
+++ b/commercial-settings.gradle
@@ -23,9 +23,9 @@ allprojects {
 			}
 		}
 		else {
-			maven { url 'https://repo.spring.io/spring-commercial-release-remote' }
+			maven { url 'https://repo.spring.io/artifactory/spring-commercial-release-remote-cache' }
 			if (version.endsWith('SNAPSHOT')) {
-				maven { url 'https://repo.spring.io/spring-commercial-snapshot-remote' }
+				maven { url 'https://repo.spring.io/artifactory/spring-commercial-snapshot-remote-cache' }
 			}
 		}
 	}