diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce711fb77..be3f2d6f9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,11 +38,14 @@ commands:
       cache_version:
         type: string
         default: "v1"
+      goversion:
+        type: string
+        default: 1.21.0
     steps:
       - check-changed-files-or-halt
       - restore_cache:
           name: "Restore binaries from cache"
-          key: << parameters.os >>-<< parameters.arch >>-go-bin-<< parameters.cache_version >>-{{ checksum "go.sum" }}
+          key: << parameters.os >>-<< parameters.arch >>-go<< parameters.goversion >>-<< parameters.cache_version >>-{{ checksum "go.sum" }}
       - when:
           condition:
             equal: [ linux, << parameters.os >> ]
@@ -123,7 +126,7 @@ commands:
           steps:
             - save_cache:
                 name: 'Saving binaries to cache'
-                key: << parameters.os >>-<< parameters.arch >>-go-bin-<< parameters.cache_version >>-{{ checksum "go.sum" }}
+                key: << parameters.os >>-<< parameters.arch >>-go<< parameters.goversion >>-<< parameters.cache_version >>-{{ checksum "go.sum" }}
                 paths:
                   - '/go/src/github.com/influxdata/telegraf/gotestsum'
       - when:
@@ -132,7 +135,7 @@ commands:
           steps:
             - save_cache:
                 name: 'Saving binaries to cache'
-                key: << parameters.os >>-<< parameters.arch >>-go-bin-<< parameters.cache_version >>-{{ checksum "go.sum" }}
+                key: << parameters.os >>-<< parameters.arch >>-go<< parameters.goversion >>-<< parameters.cache_version >>-{{ checksum "go.sum" }}
                 paths:
                   - '~/go/src/github.com/influxdata/telegraf/gotestsum'
                   - '/usr/local/Cellar/go'
@@ -144,7 +147,7 @@ commands:
           steps:
             - save_cache:
                 name: 'Saving binaries to cache'
-                key: << parameters.os >>-<< parameters.arch >>-go-bin-<< parameters.cache_version >>-{{ checksum "go.sum" }}
+                key: << parameters.os >>-<< parameters.arch >>-go<< parameters.goversion >>-<< parameters.cache_version >>-{{ checksum "go.sum" }}
                 paths:
                   - '~\project\gotestsum.exe'
                   - 'C:\Program Files\Go'
diff --git a/tools/update_goversion/main.go b/tools/update_goversion/main.go
index 29742e580..2053418c4 100644
--- a/tools/update_goversion/main.go
+++ b/tools/update_goversion/main.go
@@ -149,6 +149,11 @@ func main() {
 			Regex:    `(quay\.io\/influxdb\/telegraf-ci):(\d.\d*.\d)`,
 			Replace:  fmt.Sprintf("$1:%s", version),
 		},
+		{
+			FileName: ".circleci/config.yml",
+			Regex:    `(default): "(\d.\d*.\d)"`,
+			Replace:  fmt.Sprintf("$1: %s", version),
+		},
 		{
 			FileName: ".github/workflows/govulncheck.yml",
 			Regex:    `(go-version-input).*`,