diff --git a/scripts/Dockerfile.build b/scripts/Dockerfile.build
index c68ecc44..614fe037 100644
--- a/scripts/Dockerfile.build
+++ b/scripts/Dockerfile.build
@@ -15,8 +15,8 @@ RUN arch="$(uname -m)"; \
     if [ "${arch}" = 'x86_64' ]; then \
     arch='amd64'; \
     fi; \
-    wget -O go1.20.11.linux-${arch}.tar.gz https://go.dev/dl/go1.20.11.linux-${arch}.tar.gz; \
-    tar -C /usr/local -xzf go1.20.11.linux-${arch}.tar.gz
+    wget -O go1.21.5.linux-${arch}.tar.gz https://go.dev/dl/go1.21.5.linux-${arch}.tar.gz; \
+    tar -C /usr/local -xzf go1.21.5.linux-${arch}.tar.gz
 
 # cache dependencies
 COPY ./scripts/.cache/go.mod /tmp/dd/datadog-agent
diff --git a/scripts_v2/Dockerfile.build b/scripts_v2/Dockerfile.build
index efb17716..6e7771e7 100644
--- a/scripts_v2/Dockerfile.build
+++ b/scripts_v2/Dockerfile.build
@@ -14,8 +14,8 @@ RUN arch="$(uname -m)"; \
     if [ "${arch}" = 'x86_64' ]; then \
     arch='amd64'; \
     fi; \
-    wget -O go1.20.11.linux-${arch}.tar.gz https://go.dev/dl/go1.20.11.linux-${arch}.tar.gz; \
-    tar -C /usr/local -xzf go1.20.11.linux-${arch}.tar.gz
+    wget -O go1.21.5.linux-${arch}.tar.gz https://go.dev/dl/go1.21.5.linux-${arch}.tar.gz; \
+    tar -C /usr/local -xzf go1.21.5.linux-${arch}.tar.gz
 
 RUN mkdir -p /tmp/dd