diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml
index 0c242eeb..0c243144 100644
--- a/.github/workflows/static.yaml
+++ b/.github/workflows/static.yaml
@@ -231,7 +231,7 @@ jobs:
       -
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache-dependency-path: |
             go.sum 
             caddy/go.sum
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 4ddb7e7f..a92464ed 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -22,7 +22,7 @@ jobs:
       -
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache-dependency-path: |
             go.sum 
             caddy/go.sum
diff --git a/caddy/go.mod b/caddy/go.mod
index 38397d3e..1979faa7 100644
--- a/caddy/go.mod
+++ b/caddy/go.mod
@@ -2,6 +2,8 @@ module github.com/dunglas/frankenphp/caddy
 
 go 1.21
 
+toolchain go1.22.0
+
 replace github.com/dunglas/frankenphp => ../
 
 retract v1.0.0-rc.1 // Human error
diff --git a/dev-alpine.Dockerfile b/dev-alpine.Dockerfile
index 84fabb43..3f95eef1 100644
--- a/dev-alpine.Dockerfile
+++ b/dev-alpine.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.21-alpine
+FROM golang:1.22-alpine
 
 ENV CFLAGS="-ggdb3"
 ENV PHPIZE_DEPS \
diff --git a/dev.Dockerfile b/dev.Dockerfile
index 4a9dd318..09634c44 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.21
+FROM golang:1.22
 
 ENV CFLAGS="-ggdb3"
 ENV PHPIZE_DEPS \
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 17b92e89..6f9b76ab 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -11,7 +11,7 @@ variable "PHP_VERSION" {
 }
 
 variable "GO_VERSION" {
-    default = "1.21"
+    default = "1.22"
 }
 
 variable "SHA" {}
diff --git a/go.mod b/go.mod
index d37177c5..4695d9c0 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,8 @@ module github.com/dunglas/frankenphp
 
 go 1.21
 
+toolchain go1.22.0
+
 retract v1.0.0-rc.1 // Human error
 
 require (