diff --git a/.changelog/20545.txt b/.changelog/20545.txt
new file mode 100644
index 0000000000..fc6d2802db
--- /dev/null
+++ b/.changelog/20545.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+Upgrade to use Go 1.21.7.
+```
\ No newline at end of file
diff --git a/.go-version b/.go-version
index c262b1f0df..8819d012ce 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.6
+1.21.7