diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 2fd4654378..7bb3b74946 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -32,7 +32,7 @@ resources:
   type: pull-request
   icon: source-pull
   source:
-    access_token: ((github-access-token))
+    access_token: ((github-ci-pull-request-token))
     repo: ((github-repo-name))
     base: ((branch))
     ignore_paths: ["ci/*"]
@@ -42,7 +42,7 @@ resources:
   source:
     owner: spring-projects
     repository: spring-boot
-    access_token: ((github-release-notes-access-token))
+    access_token: ((github-ci-release-token))
     pre_release: true
 - name: github-release
   type: github-release
@@ -50,7 +50,7 @@ resources:
   source:
     owner: spring-projects
     repository: spring-boot
-    access_token: ((github-release-notes-access-token))
+    access_token: ((github-ci-release-token))
     pre_release: false
 - name: ci-images-git-repo
   type: git
@@ -96,7 +96,7 @@ resources:
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
-    access_token: ((github-access-token))
+    access_token: ((github-ci-status-token))
     branch: ((branch))
     context: build
 - name: repo-status-jdk9-build
@@ -104,7 +104,7 @@ resources:
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
-    access_token: ((github-access-token))
+    access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk9-build
 - name: repo-status-jdk10-build
@@ -112,7 +112,7 @@ resources:
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
-    access_token: ((github-access-token))
+    access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk10-build
 - name: slack-alert
@@ -409,7 +409,7 @@ jobs:
     params:
       RELEASE_TYPE: M
       GITHUB_USERNAME: ((github-username))
-      GITHUB_TOKEN: ((github-release-notes-access-token))
+      GITHUB_TOKEN: ((github-ci-release-token))
   - put: github-pre-release
     params:
       name: generated-release-notes/tag
@@ -439,7 +439,7 @@ jobs:
     params:
       RELEASE_TYPE: RC
       GITHUB_USERNAME: ((github-username))
-      GITHUB_TOKEN: ((github-release-notes-access-token))
+      GITHUB_TOKEN: ((github-ci-release-token))
   - put: github-pre-release
     params:
       name: generated-release-notes/tag
@@ -493,7 +493,7 @@ jobs:
     params:
       RELEASE_TYPE: RELEASE
       GITHUB_USERNAME: ((github-username))
-      GITHUB_TOKEN: ((github-release-notes-access-token))
+      GITHUB_TOKEN: ((github-ci-release-token))
   - put: github-release
     params:
       name: generated-release-notes/tag