diff --git a/dockerfiles/agent/container/Dockerfile b/dockerfiles/agent/container/Dockerfile
index 0618b877..c8b31212 100644
--- a/dockerfiles/agent/container/Dockerfile
+++ b/dockerfiles/agent/container/Dockerfile
@@ -1,5 +1,5 @@
-FROM cgr.dev/chainguard/wolfi-base AS builder
-RUN apk update && apk add go-1.21
+FROM cgr.dev/chainguard/go:latest AS builder
+
 WORKDIR /
 COPY ./ ./
 
diff --git a/dockerfiles/agent/git/Dockerfile b/dockerfiles/agent/git/Dockerfile
index 59eead63..5b8656f1 100644
--- a/dockerfiles/agent/git/Dockerfile
+++ b/dockerfiles/agent/git/Dockerfile
@@ -1,5 +1,5 @@
-FROM cgr.dev/chainguard/wolfi-base AS builder
-RUN apk update && apk add go-1.21
+FROM cgr.dev/chainguard/go:latest AS builder
+
 WORKDIR /
 COPY ./ ./
 
diff --git a/dockerfiles/client/Dockerfile b/dockerfiles/client/Dockerfile
index 9890d55e..a8e03478 100644
--- a/dockerfiles/client/Dockerfile
+++ b/dockerfiles/client/Dockerfile
@@ -1,6 +1,6 @@
 # Build the manager binary
-FROM cgr.dev/chainguard/wolfi-base AS builder
-RUN apk update && apk add go-1.21
+FROM cgr.dev/chainguard/go:latest AS builder
+
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY ./ ./
diff --git a/dockerfiles/migration/Dockerfile b/dockerfiles/migration/Dockerfile
index ecf848cf..af93a514 100644
--- a/dockerfiles/migration/Dockerfile
+++ b/dockerfiles/migration/Dockerfile
@@ -1,5 +1,4 @@
-FROM cgr.dev/chainguard/wolfi-base AS builder
-RUN apk update && apk add go-1.21
+FROM cgr.dev/chainguard/go:latest AS builder
 WORKDIR /workspace
 COPY ./ ./
 RUN go mod download
@@ -10,7 +9,7 @@ RUN chmod +x /workspace/script/wait-for-clickhouse.sh
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM cgr.dev/chainguard/static:latest
+FROM cgr.dev/chainguard/wolfi-base
 RUN apk add --no-cache netcat-openbsd
 WORKDIR /
 COPY --from=builder /workspace/migration .