diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24f03f218cfc..e3e1a9925073 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,11 +26,6 @@ Main (unreleased)
     - renamed 3 metrics starting with `mysql_perf_schema_transaction_` to start with `mysql_perf_schema_transactions_` to be consistent with column names.
     - exposing only server's own stats by matching `MEMBER_ID` with `@@server_uuid` resulting "member_id" label to be dropped.
 
-### Other changes
-
-- Bump `mysqld_exporter` version to v0.15.0. (@marctc)
-- Bump `github-exporter` version to 1.0.6. (@marctc)
-
 ### Features
 
 - Added a new `stage.decolorize` stage to `loki.process` component which
@@ -149,6 +144,14 @@ Main (unreleased)
 - Fix a bug which prevented Agent from running `otelcol.exporter.loadbalancing`
   with a `routing_key` of `traceID`. (@ptodev)
 
+### Other changes
+
+- Bump `mysqld_exporter` version to v0.15.0. (@marctc)
+
+- Bump `github-exporter` version to 1.0.6. (@marctc)
+
+- Use Go 1.21.4 for builds. (@rfratto)
+
 v0.37.4 (2023-11-06)
 -----------------
 
diff --git a/build-image/Dockerfile b/build-image/Dockerfile
index fb3861df11d4..eeea8fdce018 100644
--- a/build-image/Dockerfile
+++ b/build-image/Dockerfile
@@ -23,7 +23,7 @@ FROM alpine:3.17 as helm
 RUN apk add --no-cache helm
 
 # Dependency: Go and Go dependencies
-FROM golang:1.21.3-bullseye as golang
+FROM golang:1.21.4-bullseye as golang
 
 # Keep in sync with cmd/grafana-agent-operator/DEVELOPERS.md
 ENV CONTROLLER_GEN_VERSION v0.9.2
diff --git a/build-image/windows/Dockerfile b/build-image/windows/Dockerfile
index 1f4efb7beb2a..6664d8928e82 100644
--- a/build-image/windows/Dockerfile
+++ b/build-image/windows/Dockerfile
@@ -1,4 +1,4 @@
-FROM library/golang:1.21.3-windowsservercore-1809
+FROM library/golang:1.21.4-windowsservercore-1809
 
 SHELL ["powershell", "-command"]