diff --git a/.github/workflows/build_daily.yaml b/.github/workflows/build_daily.yaml
index 80f7b7bf976..ed21dabd5cf 100644
--- a/.github/workflows/build_daily.yaml
+++ b/.github/workflows/build_daily.yaml
@@ -10,7 +10,7 @@ on:
 env:
   GOPROXY: https://proxy.golang.org/
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GO_VERSION: 1.21.5
+  GO_VERSION: 1.21.6
 jobs:
   e2e-envoy-xds:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/build_tag.yaml b/.github/workflows/build_tag.yaml
index 2d2ed44e10a..42d4da9f097 100644
--- a/.github/workflows/build_tag.yaml
+++ b/.github/workflows/build_tag.yaml
@@ -15,7 +15,7 @@ on:
 env:
   GOPROXY: https://proxy.golang.org/
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GO_VERSION: 1.21.5
+  GO_VERSION: 1.21.6
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f9103325ba7..7f63f0828ca 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   GOPROXY: https://proxy.golang.org/
-  GO_VERSION: 1.21.5
+  GO_VERSION: 1.21.6
 jobs:
   CodeQL-Build:
 
diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml
index 0016ab9fa37..3e653681476 100644
--- a/.github/workflows/prbuild.yaml
+++ b/.github/workflows/prbuild.yaml
@@ -11,7 +11,7 @@ on:
 env:
   GOPROXY: https://proxy.golang.org/
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  GO_VERSION: 1.21.5
+  GO_VERSION: 1.21.6
 jobs:
   lint:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index 81255feef62..faee470df42 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ endif
 IMAGE_PLATFORMS ?= linux/amd64,linux/arm64
 
 # Base build image to use.
-BUILD_BASE_IMAGE ?= golang:1.21.5
+BUILD_BASE_IMAGE ?= golang:1.21.6@sha256:acab8ef05990e50fe0bc8446398d93d91fa89b3608661529dbd6744b77fcea90
 
 # Enable build with CGO.
 BUILD_CGO_ENABLED ?= 0
diff --git a/changelogs/unreleased/6053-sunjayBhatia-small.md b/changelogs/unreleased/6053-sunjayBhatia-small.md
deleted file mode 100644
index f7590e4ec01..00000000000
--- a/changelogs/unreleased/6053-sunjayBhatia-small.md
+++ /dev/null
@@ -1 +0,0 @@
-Updates to Go 1.21.5. See the [Go release notes](https://go.dev/doc/devel/release#go1.21.minor) for more information.
diff --git a/changelogs/unreleased/6070-sunjayBhatia-small.md b/changelogs/unreleased/6070-sunjayBhatia-small.md
new file mode 100644
index 00000000000..5ee1d76652f
--- /dev/null
+++ b/changelogs/unreleased/6070-sunjayBhatia-small.md
@@ -0,0 +1 @@
+Updates to Go 1.21.6. See the [Go release notes](https://go.dev/doc/devel/release#go1.21.minor) for more information.