diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 92e79105e..2d6c8fd5a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,8 +27,8 @@ jobs:
       fail-fast: false
       matrix:
         go:
-          - 1.21.8
-          - 1.22.1
+          - 1.21.12
+          - 1.22.5
         target:
           - test-coverage
           - test-cloud-storage
diff --git a/Dockerfile b/Dockerfile
index 822b04a4f..0a1430aff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.22.4
+ARG GO_VERSION=1.22.5
 ARG ALPINE_VERSION=3.20
 ARG XX_VERSION=1.2.1
 
diff --git a/dockerfiles/docs.Dockerfile b/dockerfiles/docs.Dockerfile
index f75269b40..0ce9f6ca3 100644
--- a/dockerfiles/docs.Dockerfile
+++ b/dockerfiles/docs.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.22.4
+ARG GO_VERSION=1.22.5
 ARG ALPINE_VERSION=3.20
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
diff --git a/dockerfiles/git.Dockerfile b/dockerfiles/git.Dockerfile
index bc72f269a..c86093ce2 100644
--- a/dockerfiles/git.Dockerfile
+++ b/dockerfiles/git.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.22.4
+ARG GO_VERSION=1.22.5
 ARG ALPINE_VERSION=3.20
 
 FROM alpine:${ALPINE_VERSION} AS base
diff --git a/dockerfiles/lint.Dockerfile b/dockerfiles/lint.Dockerfile
index f55ec60e2..99cc659e1 100644
--- a/dockerfiles/lint.Dockerfile
+++ b/dockerfiles/lint.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.22.4
+ARG GO_VERSION=1.22.5
 ARG ALPINE_VERSION=3.20
 ARG GOLANGCI_LINT_VERSION=v1.59.1
 ARG BUILDTAGS=""
diff --git a/dockerfiles/vendor.Dockerfile b/dockerfiles/vendor.Dockerfile
index ab1062491..1f35e8f5d 100644
--- a/dockerfiles/vendor.Dockerfile
+++ b/dockerfiles/vendor.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.22.4
+ARG GO_VERSION=1.22.5
 ARG ALPINE_VERSION=3.20
 ARG MODOUTDATED_VERSION=v0.8.0
 
diff --git a/go.mod b/go.mod
index 5a1e2503d..17615a83b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/distribution/distribution/v3
 
-go 1.22.4
+go 1.22.5
 
 require (
 	cloud.google.com/go/storage v1.30.1