diff --git a/internal/ci/core/core.cue b/internal/ci/core/core.cue
index 1251d9c22c4..fbcbd41c79a 100644
--- a/internal/ci/core/core.cue
+++ b/internal/ci/core/core.cue
@@ -13,18 +13,10 @@ macosMachine:   "macos-11"
 windowsMachine: "windows-2022"
 
 // Define core URLs that will be used in the codereview.cfg and GitHub workflows
-githubRepositoryURL:    "https://github.com/cue-lang/cue"
-gerritHubHostname:      "review.gerrithub.io"
-gerritHubRepositoryURL: "https://\(gerritHubHostname)/a/cue-lang/cue"
-githubRepositoryPath:   "cue-lang/cue"
-unityRepositoryURL:     "https://github.com/cue-unity/unity"
-
-botGitHubUser:                      "cueckoo"
-botGitHubUserTokenSecretsKey:       "CUECKOO_GITHUB_PAT"
-botGitHubUserEmail:                 "cueckoo@gmail.com"
-botGerritHubUser:                   botGitHubUser
-botGerritHubUserPasswordSecretsKey: "CUECKOO_GERRITHUB_PASSWORD"
-botGerritHubUserEmail:              botGitHubUserEmail
+githubRepositoryURL:  "https://github.com/cue-lang/cue"
+gerritRepositoryURL:  "https://review.gerrithub.io/a/cue-lang/cue"
+githubRepositoryPath: "cue-lang/cue"
+unityRepositoryURL:   "https://github.com/cue-unity/unity"
 
 // Use the latest Go version for extra checks,
 // such as running tests with the data race detector.
@@ -73,7 +65,7 @@ zeroReleaseTagPattern: "*" + zeroReleaseTagSuffix
 
 codeReview: base.#codeReview & {
 	github:      githubRepositoryURL
-	gerrit:      gerritHubRepositoryURL
+	gerrit:      gerritRepositoryURL
 	"cue-unity": unityRepositoryURL
 }
 
diff --git a/internal/ci/github/workflows.cue b/internal/ci/github/workflows.cue
index 07e1958dd5c..baa8a90863a 100644
--- a/internal/ci/github/workflows.cue
+++ b/internal/ci/github/workflows.cue
@@ -57,12 +57,12 @@ workflows: close({
 _gerrithub: gerrithub & {
 	#repositoryURL:                      core.githubRepositoryURL
 	#trybotKey:                          _base.trybot.key
-	#botGitHubUser:                      core.botGitHubUser
-	#botGitHubUserTokenSecretsKey:       core.botGitHubUserTokenSecretsKey
-	#botGitHubUserEmail:                 core.botGitHubUserEmail
-	#botGerritHubUser:                   core.botGitHubUser
-	#botGerritHubUserPasswordSecretsKey: core.botGerritHubUserPasswordSecretsKey
-	#botGerritHubUserEmail:              core.botGitHubUserEmail
+	#botGitHubUser:                      "cueckoo"
+	#botGitHubUserTokenSecretsKey:       "CUECKOO_GITHUB_PAT"
+	#botGitHubUserEmail:                 "cueckoo@gmail.com"
+	#botGerritHubUser:                   #botGitHubUser
+	#botGerritHubUserPasswordSecretsKey: "CUECKOO_GERRITHUB_PASSWORD"
+	#botGerritHubUserEmail:              #botGitHubUserEmail
 }
 
 // _base is an instance of ./base, parameterised by the properties of this
@@ -74,8 +74,8 @@ _gerrithub: gerrithub & {
 _base: base & {
 	#githubRepositoryURL:          core.githubRepositoryURL
 	#defaultBranch:                core.defaultBranch
-	#botGitHubUser:                core.botGitHubUser
-	#botGitHubUserTokenSecretsKey: core.botGitHubUserTokenSecretsKey
+	#botGitHubUser:                "cueckoo"
+	#botGitHubUserTokenSecretsKey: "CUECKOO_GITHUB_PAT"
 	#protectedBranchPatterns:      core.protectedBranchPatterns
 	#releaseTagPattern:            core.releaseTagPattern
 }