diff --git a/Dockerfile b/Dockerfile
index 6ce448399b..c48d292535 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ ARG FLYTECONSOLE_VERSION=latest
 FROM ghcr.io/flyteorg/flyteconsole:${FLYTECONSOLE_VERSION} AS flyteconsole
 
 
-FROM --platform=${BUILDPLATFORM} golang:1.21.5-bookworm AS flytebuilder
+FROM --platform=${BUILDPLATFORM} golang:1.21-bookworm AS flytebuilder
 
 ARG TARGETARCH
 ENV GOARCH "${TARGETARCH}"
diff --git a/Dockerfile.datacatalog b/Dockerfile.datacatalog
index 065eb28722..641b1b9fd6 100644
--- a/Dockerfile.datacatalog
+++ b/Dockerfile.datacatalog
@@ -1,9 +1,9 @@
 # WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES.
 # ONLY EDIT THIS FILE FROM WITHIN THE 'FLYTEORG/BOILERPLATE' REPOSITORY:
-# 
+#
 # TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst
 
-FROM --platform=${BUILDPLATFORM} golang:1.21.5-alpine3.18 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder
 
 ARG TARGETARCH
 ENV GOARCH "${TARGETARCH}"
diff --git a/Dockerfile.flyteadmin b/Dockerfile.flyteadmin
index 993949b221..6b6225ec6f 100644
--- a/Dockerfile.flyteadmin
+++ b/Dockerfile.flyteadmin
@@ -1,9 +1,9 @@
 # WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES.
 # ONLY EDIT THIS FILE FROM WITHIN THE 'LYFT/BOILERPLATE' REPOSITORY:
-# 
+#
 # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst
 
-FROM --platform=${BUILDPLATFORM} golang:1.21.5-alpine3.18 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder
 
 ARG TARGETARCH
 ENV GOARCH "${TARGETARCH}"
diff --git a/Dockerfile.flytecopilot b/Dockerfile.flytecopilot
index 247a04e969..e19df0743d 100644
--- a/Dockerfile.flytecopilot
+++ b/Dockerfile.flytecopilot
@@ -1,9 +1,9 @@
 # WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES.
 # ONLY EDIT THIS FILE FROM WITHIN THE 'LYFT/BOILERPLATE' REPOSITORY:
-# 
+#
 # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst
 
-FROM --platform=${BUILDPLATFORM} golang:1.21.5-alpine3.18 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder
 
 ARG TARGETARCH
 ENV GOARCH "${TARGETARCH}"
diff --git a/Dockerfile.flytepropeller b/Dockerfile.flytepropeller
index 8da39815be..8cbdd40f14 100644
--- a/Dockerfile.flytepropeller
+++ b/Dockerfile.flytepropeller
@@ -1,9 +1,9 @@
 # WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES.
 # ONLY EDIT THIS FILE FROM WITHIN THE 'LYFT/BOILERPLATE' REPOSITORY:
-# 
+#
 # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst
 
-FROM --platform=${BUILDPLATFORM} golang:1.21.5-alpine3.18 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder
 
 ARG TARGETARCH
 ENV GOARCH "${TARGETARCH}"
diff --git a/Dockerfile.flytescheduler b/Dockerfile.flytescheduler
index 2956d93959..fa7f1906a3 100644
--- a/Dockerfile.flytescheduler
+++ b/Dockerfile.flytescheduler
@@ -1,9 +1,9 @@
 # WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES.
 # ONLY EDIT THIS FILE FROM WITHIN THE 'LYFT/BOILERPLATE' REPOSITORY:
-# 
+#
 # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst
 
-FROM --platform=${BUILDPLATFORM} golang:1.21.5-alpine3.18 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.21-alpine3.18 as builder
 
 ARG TARGETARCH
 ENV GOARCH "${TARGETARCH}"