diff --git a/.circleci/config.yml b/.circleci/config.yml
index 519f8fa40..409f3bb7c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,7 @@ executors:
     working_directory: '/go/src/github.com/influxdata/telegraf'
     resource_class: large
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.21.4'
+      - image: 'quay.io/influxdb/telegraf-ci:1.21.5'
     environment:
       GOFLAGS: -p=4
   mac:
@@ -40,7 +40,7 @@ commands:
         default: "v1"
       goversion:
         type: string
-        default: 1.21.4
+        default: 1.21.5
     steps:
       - check-changed-files-or-halt
       - when:
@@ -229,7 +229,7 @@ jobs:
     parameters:
       goversion:
         type: string
-        default: 1.21.4
+        default: 1.21.5
       cache_version:
         type: string
         default: "v1"
@@ -261,7 +261,7 @@ jobs:
     parameters:
       goversion:
         type: string
-        default: 1.21.4
+        default: 1.21.5
       cache_version:
         type: string
         default: "v1"
@@ -298,7 +298,7 @@ jobs:
     parameters:
       goversion:
         type: string
-        default: 1.21.4
+        default: 1.21.5
       cache_version:
         type: string
         default: "v1"
@@ -321,7 +321,7 @@ jobs:
     parameters:
       goversion:
         type: string
-        default: 1.21.4
+        default: 1.21.5
       cache_version:
         type: string
         default: "v1"
@@ -350,7 +350,7 @@ jobs:
     parameters:
       goversion:
         type: string
-        default: 1.21.4
+        default: 1.21.5
       cache_version:
         type: string
         default: "v1"
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index 5be4bfa36..80f33dc3d 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -15,5 +15,5 @@ jobs:
       - name: Scan for Vulnerabilities in Code
         uses: golang/govulncheck-action@v1
         with:
-          go-version-input: 1.21.4
+          go-version-input: 1.21.5
           go-package: ./...
diff --git a/Makefile b/Makefile
index 91a1d8b2c..a09214b3f 100644
--- a/Makefile
+++ b/Makefile
@@ -249,8 +249,8 @@ plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
 
 .PHONY: ci
 ci:
-	docker build -t quay.io/influxdb/telegraf-ci:1.21.4 - < scripts/ci.docker
-	docker push quay.io/influxdb/telegraf-ci:1.21.4
+	docker build -t quay.io/influxdb/telegraf-ci:1.21.5 - < scripts/ci.docker
+	docker push quay.io/influxdb/telegraf-ci:1.21.5
 
 .PHONY: install
 install: $(buildbin)
diff --git a/scripts/ci.docker b/scripts/ci.docker
index 379d13f48..5fcf1980b 100644
--- a/scripts/ci.docker
+++ b/scripts/ci.docker
@@ -1,4 +1,4 @@
-FROM golang:1.21.4
+FROM golang:1.21.5
 
 RUN chmod -R 755 "$GOPATH"
 
diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh
index da71f4e70..d32853972 100644
--- a/scripts/installgo_linux.sh
+++ b/scripts/installgo_linux.sh
@@ -2,10 +2,10 @@
 
 set -eux
 
-GO_VERSION="1.21.4"
+GO_VERSION="1.21.5"
 GO_ARCH="linux-amd64"
 # from https://golang.org/dl
-GO_VERSION_SHA="73cac0215254d0c7d1241fa40837851f3b9a8a742d0b54714cbdfb3feaf8f0af"
+GO_VERSION_SHA="e2bc0b3e4b64111ec117295c088bde5f00eeed1567999ff77bc859d7df70078e"
 
 # Download Go and verify Go tarball
 setup_go () {
diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh
index 498c3a480..21d830765 100644
--- a/scripts/installgo_mac.sh
+++ b/scripts/installgo_mac.sh
@@ -3,9 +3,9 @@
 set -eux
 
 ARCH=$(uname -m)
-GO_VERSION="1.21.4"
-GO_VERSION_SHA_arm64="8b7caf2ac60bdff457dba7d4ff2a01def889592b834453431ae3caecf884f6a5" # from https://golang.org/dl
-GO_VERSION_SHA_amd64="cd3bdcc802b759b70e8418bc7afbc4a65ca73a3fe576060af9fc8a2a5e71c3b8" # from https://golang.org/dl
+GO_VERSION="1.21.5"
+GO_VERSION_SHA_arm64="d0f8ac0c4fb3efc223a833010901d02954e3923cfe2c9a2ff0e4254a777cc9cc" # from https://golang.org/dl
+GO_VERSION_SHA_amd64="a2e1d5743e896e5fe1e7d96479c0a769254aed18cf216cf8f4c3a2300a9b3923" # from https://golang.org/dl
 
 if [ "$ARCH" = 'arm64' ]; then
     GO_ARCH="darwin-arm64"
diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh
index 211e4089d..6d207b7da 100644
--- a/scripts/installgo_windows.sh
+++ b/scripts/installgo_windows.sh
@@ -2,7 +2,7 @@
 
 set -eux
 
-GO_VERSION="1.21.4"
+GO_VERSION="1.21.5"
 
 setup_go () {
     choco upgrade golang --allow-downgrade --force --version=${GO_VERSION}