diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index eeb6252708..317a3e14e5 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   ALLOWED_ENDPOINTS: >
     api.adoptium.net:443
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index 19ce5171e8..5f04002457 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   PUBLISH_JDK: 21
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fd52d8c280..29bd519f8d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,6 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   ALLOWED_ENDPOINTS: >
     *.actions.githubusercontent.com:443
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 455dd18219..109ed5d882 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -21,7 +21,6 @@ permissions:
   security-events: write
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 11
 
diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
index 6561044775..1d1862a8b3 100644
--- a/.github/workflows/dependency-check.yml
+++ b/.github/workflows/dependency-check.yml
@@ -7,7 +7,6 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 21
 
diff --git a/.github/workflows/dependency-submission-pr-retreive.yml b/.github/workflows/dependency-submission-pr-retreive.yml
index 7443614e45..0e9c57c039 100644
--- a/.github/workflows/dependency-submission-pr-retreive.yml
+++ b/.github/workflows/dependency-submission-pr-retreive.yml
@@ -6,7 +6,6 @@ on:
     types: [completed]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 21
 
diff --git a/.github/workflows/dependency-submission-pr-submit.yml b/.github/workflows/dependency-submission-pr-submit.yml
index 64eaa53327..e742f7d3dd 100644
--- a/.github/workflows/dependency-submission-pr-submit.yml
+++ b/.github/workflows/dependency-submission-pr-submit.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 21
 
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index 454cb433f4..212289dff6 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ push ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 21
 
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index b135f9662d..2f3ddef51c 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 21
 
diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
index 64fdab6cfb..951b244777 100644
--- a/.github/workflows/qodana.yml
+++ b/.github/workflows/qodana.yml
@@ -3,7 +3,6 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 11
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0c314d008e..7a52616f3b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,7 +5,6 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
   JAVA_VERSION: 11
 
diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
index 6210d275d8..d99f1cf302 100644
--- a/.github/workflows/snyk.yml
+++ b/.github/workflows/snyk.yml
@@ -5,7 +5,6 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
diff --git a/gradle/gradle-enterprise.gradle b/gradle/gradle-enterprise.gradle
index 7b058c5ae4..cd8cac96ea 100644
--- a/gradle/gradle-enterprise.gradle
+++ b/gradle/gradle-enterprise.gradle
@@ -23,16 +23,10 @@ gradleEnterprise {
 
 buildCache {
   local.enabled = true
-  remote(HttpBuildCache) {
-    url = 'https://caffeine.gradle-enterprise.cloud/cache/'
+  remote(gradleEnterprise.buildCache) {
     enabled = true
-    def cachePassword = settings.ext.find('gradleEnterpriseCachePassword')
-        ?: System.env.GRADLE_ENTERPRISE_CACHE_PASSWORD
+    def accessKey = System.env.GRADLE_ENTERPRISE_ACCESS_KEY
     // Check cache password presence to avoid build cache errors on PR builds when not present
-    push = System.env.CI && cachePassword
-    credentials {
-      username = 'ci'
-      password = cachePassword
-    }
+    push = System.env.CI && accessKey
   }
 }