diff --git a/.ci/updatecli/updatecli-bump-golang.yml b/.ci/updatecli/updatecli-bump-golang.yml
index be86caf4d20..432d6bf0f5b 100644
--- a/.ci/updatecli/updatecli-bump-golang.yml
+++ b/.ci/updatecli/updatecli-bump-golang.yml
@@ -12,7 +12,7 @@ scms:
       repository: '{{ .scm.repository }}'
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       commitusingapi: true
-      branch: main
+      branch: '{{ .scm.branch }}'
       force: false
 
 actions:
@@ -84,15 +84,6 @@ targets:
       content: '{{ source "latestGoVersion" }}'
       file: .go-version
       matchpattern: '\d+.\d+.\d+'
-  update-golang.ci:
-    name: "Update .golangci.yml"
-    sourceid: latestGoVersion
-    scmid: githubConfig
-    kind: file
-    spec:
-      content: '{{ source "latestGoVersion" }}'
-      file: .golangci.yml
-      matchpattern: '\d+.\d+.\d+'
   update-version.asciidoc:
     name: "Update version.asciidoc"
     sourceid: latestGoVersion
@@ -122,3 +113,12 @@ targets:
       content: 'go {{ source "latestGoVersion" }}'
       file: go.mod
       matchpattern: 'go \d+.\d+.\d+'
+  update-buildkite-pipeline:
+    name: "Update .buildkite/pipeline.yml"
+    sourceid: latestGoVersion
+    scmid: githubConfig
+    kind: file
+    spec:
+      content: 'golang:{{ source "latestGoVersion" }}'
+      file: .buildkite/pipeline.yml
+      matchpattern: 'golang:\d+.\d+.\d+'