diff --git a/.woodpecker/build-package.yml b/.woodpecker/build-package.yml
index db8682b..57fe087 100644
--- a/.woodpecker/build-package.yml
+++ b/.woodpecker/build-package.yml
@@ -10,7 +10,7 @@ when:
 
 steps:
   - name: build
-    image: docker.io/techknowlogick/xgo:go-1.21.x
+    image: docker.io/techknowlogick/xgo:go-1.22.x
     commands:
       - ln -s $(pwd) /source
       - make release
diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml
index 8f1aa89..a282c9a 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/test.yml
@@ -10,11 +10,11 @@ when:
 
 steps:
   - name: lint
-    image: docker.io/library/golang:1.21
+    image: docker.io/library/golang:1.22
     commands:
       - make lint
 
   - name: test
-    image: docker.io/library/golang:1.21
+    image: docker.io/library/golang:1.22
     commands:
       - make test
diff --git a/Containerfile.multiarch b/Containerfile.multiarch
index 2a56242..9686ace 100644
--- a/Containerfile.multiarch
+++ b/Containerfile.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21@sha256:7b575fe0d9c2e01553b04d9de8ffea6d35ca3ab3380d2a8db2acc8f0f1519a53 as build
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22@sha256:ef61a20960397f4d44b0e729298bf02327ca94f1519239ddc6d91689615b1367 as build
 
 ARG TARGETOS
 ARG TARGETARCH
diff --git a/Makefile b/Makefile
index 1a07124..57f750f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
 GOTESTSUM_PACKAGE ?= gotest.tools/gotestsum@latest
 
 GENERATE ?=
-XGO_VERSION := go-1.21.x
+XGO_VERSION := go-1.22.x
 XGO_TARGETS ?= linux/amd64,linux/arm-6,linux/arm-7,linux/arm64
 
 TARGETOS ?= linux
diff --git a/go.mod b/go.mod
index 2b45eb7..b8f825f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/thegeeklab/git-sv
 
-go 1.21
+go 1.22
 
 require (
 	dario.cat/mergo v1.0.0
diff --git a/sv/message_test.go b/sv/message_test.go
index a8cfad9..58bde82 100644
--- a/sv/message_test.go
+++ b/sv/message_test.go
@@ -913,7 +913,7 @@ func Test_prepareHeader(t *testing.T) {
 		},
 		{
 			"matching non-conventional with invalid regex",
-			"Merged PR (\\d+): (?<header>.*)",
+			"Merged PR (\\d+): (<header>.*)",
 			"Merged PR 123: something",
 			"",
 			true,