diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 825ca9272..f8a39bf22 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
       matrix:
         go:
           - 1.22.8
-          - 1.23.2
+          - 1.23.4
         target:
           - test-coverage
           - test-cloud-storage
diff --git a/Dockerfile b/Dockerfile
index 7a73f2ebd..95f8a4850 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.23.2
-ARG ALPINE_VERSION=3.20
+ARG GO_VERSION=1.23.4
+ARG ALPINE_VERSION=3.21
 ARG XX_VERSION=1.6.1
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
diff --git a/dockerfiles/authors.Dockerfile b/dockerfiles/authors.Dockerfile
index 908898c07..fad3d4cb1 100644
--- a/dockerfiles/authors.Dockerfile
+++ b/dockerfiles/authors.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 
 FROM alpine:${ALPINE_VERSION} AS gen
 RUN apk add --no-cache git
diff --git a/dockerfiles/docs.Dockerfile b/dockerfiles/docs.Dockerfile
index 5257f20db..ec2c32d6e 100644
--- a/dockerfiles/docs.Dockerfile
+++ b/dockerfiles/docs.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.23.2
-ARG ALPINE_VERSION=3.20
+ARG GO_VERSION=1.23.4
+ARG ALPINE_VERSION=3.21
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
 RUN apk add --no-cache git
diff --git a/dockerfiles/git.Dockerfile b/dockerfiles/git.Dockerfile
index 2bc7a4de0..d0fd41e9e 100644
--- a/dockerfiles/git.Dockerfile
+++ b/dockerfiles/git.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.23.2
-ARG ALPINE_VERSION=3.20
+ARG GO_VERSION=1.23.4
+ARG ALPINE_VERSION=3.21
 
 FROM alpine:${ALPINE_VERSION} AS base
 RUN apk add --no-cache git gpg
diff --git a/dockerfiles/lint.Dockerfile b/dockerfiles/lint.Dockerfile
index f0f35c6f2..bb936b6d7 100644
--- a/dockerfiles/lint.Dockerfile
+++ b/dockerfiles/lint.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.23.2
-ARG ALPINE_VERSION=3.20
+ARG GO_VERSION=1.23.4
+ARG ALPINE_VERSION=3.21
 ARG GOLANGCI_LINT_VERSION=v1.61.0
 ARG BUILDTAGS=""
 
diff --git a/dockerfiles/vendor.Dockerfile b/dockerfiles/vendor.Dockerfile
index d7710ae7e..788764629 100644
--- a/dockerfiles/vendor.Dockerfile
+++ b/dockerfiles/vendor.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.23.2
-ARG ALPINE_VERSION=3.20
+ARG GO_VERSION=1.23.4
+ARG ALPINE_VERSION=3.21
 ARG MODOUTDATED_VERSION=v0.8.0
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
diff --git a/go.mod b/go.mod
index f57833e9e..2c3404032 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/distribution/distribution/v3
 
 go 1.22.7
 
-toolchain go1.23.2
+toolchain go1.23.4
 
 require (
 	cloud.google.com/go/storage v1.45.0