diff --git a/.ci/containers/build-environment/Dockerfile b/.ci/containers/build-environment/Dockerfile
index 2f2dcb85ecf5..d2f11e881954 100644
--- a/.ci/containers/build-environment/Dockerfile
+++ b/.ci/containers/build-environment/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Building Go dependencies
-FROM golang:1.20-bullseye AS builder
+FROM golang:1.21-bullseye AS builder
 
 # Set working directory
 WORKDIR /app
@@ -15,7 +15,7 @@ RUN go mod download
 FROM ruby:3.1-bullseye
 
 # golang
-COPY --from=golang:1.20-bullseye /usr/local/go /usr/local/go
+COPY --from=golang:1.21-bullseye /usr/local/go /usr/local/go
 ENV GOPATH /go
 ENV PATH /usr/local/go/bin:$PATH
 ENV PATH $GOPATH/bin:$PATH
diff --git a/.ci/containers/go-plus/Dockerfile b/.ci/containers/go-plus/Dockerfile
index 655f976726bf..b37e5ee8b996 100644
--- a/.ci/containers/go-plus/Dockerfile
+++ b/.ci/containers/go-plus/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Download go module cache for builds
-FROM golang:1.20-bullseye AS builder
+FROM golang:1.21-bullseye AS builder
 ENV GOCACHE=/go/cache
 
 RUN apt-get update && apt-get install -y unzip
@@ -12,7 +12,7 @@ WORKDIR /app1/magic-modules-main/.ci/magician
 RUN go build -o /dev/null .
 
 # Stage 2: Creating the final image
-FROM golang:1.20-bullseye
+FROM golang:1.21-bullseye
 SHELL ["/bin/bash", "-c"]
 ENV GOCACHE=/go/cache