diff --git a/.golangci.yml b/.golangci.yml
index 342bde5..7e7ed7d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -94,4 +94,4 @@ run:
 linters-settings:
   gofumpt:
     extra-rules: true
-    lang-version: "1.20"
+    lang-version: "1.21"
diff --git a/.woodpecker/build-binary.yml b/.woodpecker/build-binary.yml
index 21ee508..8c5bbd3 100644
--- a/.woodpecker/build-binary.yml
+++ b/.woodpecker/build-binary.yml
@@ -7,7 +7,7 @@ when:
 
 steps:
   build:
-    image: docker.io/techknowlogick/xgo:go-1.20.x
+    image: docker.io/techknowlogick/xgo:go-1.21.x
     commands:
       - ln -s $(pwd) /source
       - make release
diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml
index 01952de..ce06663 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/test.yml
@@ -7,16 +7,16 @@ when:
 
 steps:
   deps:
-    image: docker.io/library/golang:1.20
+    image: docker.io/library/golang:1.21
     commands:
       - make deps
 
   lint:
-    image: docker.io/library/golang:1.20
+    image: docker.io/library/golang:1.21
     commands:
       - make lint
 
   test:
-    image: docker.io/library/golang:1.20
+    image: docker.io/library/golang:1.21
     commands:
       - make test
diff --git a/Containerfile.multiarch b/Containerfile.multiarch
index 2a39653..77a5ae6 100644
--- a/Containerfile.multiarch
+++ b/Containerfile.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20@sha256:741d6f9bcab778441efe05c8e4369d4f8ff56c9a635a97d77f55d8b0ec62f907 as build
+FROM --platform=$BUILDPLATFORM golang:1.21@sha256:b490ae1f0ece153648dd3c5d25be59a63f966b5f9e1311245c947de4506981aa as build
 
 ARG TARGETOS
 ARG TARGETARCH
diff --git a/Makefile b/Makefile
index a70c1ab..8a299aa 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@$(G
 XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
 
 GENERATE ?=
-XGO_VERSION := go-1.20.x
+XGO_VERSION := go-1.21.x
 XGO_TARGETS ?= linux/amd64,linux/arm64
 
 TARGETOS ?= linux
diff --git a/go.mod b/go.mod
index 2a2361b..708175d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/thegeeklab/wp-docker-buildx
 
-go 1.20
+go 1.21
 
 require (
 	github.com/coreos/go-semver v0.3.1