diff --git a/internal/ci/base/gerrithub.cue b/internal/ci/base/gerrithub.cue
index 51f8e1e5c5f..d1e6a138573 100644
--- a/internal/ci/base/gerrithub.cue
+++ b/internal/ci/base/gerrithub.cue
@@ -51,7 +51,7 @@ trybotDispatchWorkflow: bashWorkflow & {
 						git remote add origin \(trybotRepositoryURL)
 						git fetch origin "${{ github.event.client_payload.payload.branch }}"
 						git push origin \(_#branchNameExpression)
-						echo ${{ secrets.CUECKOO_GITHUB_PAT }} | gh auth login --with-token
+						echo ${{ secrets.\(botGitHubUserTokenSecretsKey) }} | gh auth login --with-token
 						gh pr --repo=\(trybotRepositoryURL) create --base="${{ github.event.client_payload.payload.branch }}" --fill
 						"""
 				},
@@ -167,7 +167,7 @@ evictCaches: bashWorkflow & {
 					run: """
 						set -eux
 
-						echo ${{ secrets.CUECKOO_GITHUB_PAT }} | gh auth login --with-token
+						echo ${{ secrets.\(botGitHubUserTokenSecretsKey) }} | gh auth login --with-token
 						gh extension install actions/gh-actions-cache
 						for i in \(githubRepositoryURL) \(trybotRepositoryURL)
 						do
@@ -205,7 +205,7 @@ evictCaches: bashWorkflow & {
 }
 
 writeNetrcFile: json.#step & {
-	name: "Write netrc file for cueckoo Gerrithub"
+	name: "Write netrc file for \(botGerritHubUser) Gerrithub"
 	run:  """
 			cat <<EOD > ~/.netrc
 			machine \(gerritHubHostname)