diff --git a/Dockerfile b/Dockerfile
index ed6473d633..32dcad4edd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,12 +17,12 @@ ARG TARGETPLATFORM
 # gcc is installed for libgcc only
 RUN xx-apk add --no-cache musl-dev gcc
 
-FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-buster AS build-base-buster
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-bullseye
 COPY --from=xx / /
 RUN apt-get update && apt-get install --no-install-recommends -y clang lld file
 WORKDIR /go/src/github.com/docker/cli
 
-FROM build-base-buster AS build-buster
+FROM build-base-bullseye AS build-bullseye
 ARG TARGETPLATFORM
 RUN xx-apt install --no-install-recommends -y libc6-dev libgcc-8-dev
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index ab3efdf3ce..f370b84996 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -22,7 +22,7 @@ target "binary" {
     platforms = ["local"]
     output = ["build"]
     args = {
-        BASE_VARIANT = USE_GLIBC != "" ? "buster" : "alpine"
+        BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
         VERSION = VERSION
         GO_STRIP = STRIP_TARGET
     }
diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e
index 56a39b50cf..f80445b367 100644
--- a/dockerfiles/Dockerfile.e2e
+++ b/dockerfiles/Dockerfile.e2e
@@ -1,7 +1,7 @@
 ARG GO_VERSION=1.19.10
 
 # Use Debian based image as docker-compose requires glibc.
-FROM golang:${GO_VERSION}-buster
+FROM golang:${GO_VERSION}-bullseye
 
 RUN apt-get update && apt-get install -y \
     build-essential \