diff --git a/.go-version b/.go-version
index ce2dd53570b..c262b1f0dfd 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.5
+1.21.6
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 53beb1661ca..a0d25eae35c 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -2,7 +2,7 @@ ARG BASE_IMAGE=ubuntu:22.04
 
 # Build the apm-server binary. The golang image version is kept
 # up to date with go.mod by Makefile.
-FROM golang:1.21.5 as builder
+FROM golang:1.21.6 as builder
 WORKDIR /src
 COPY go.mod go.sum /src/
 COPY internal/glog/go.mod /src/internal/glog/go.mod