diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73122e4..c702a8d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go: ["1.21", "stable"]
+        go: ["1.22", "stable"]
     name: test
     runs-on: ubuntu-latest
     steps:
@@ -31,7 +31,7 @@ jobs:
   golangci:
     strategy:
       matrix:
-        go: ["1.21", "stable"]
+        go: ["1.22", "stable"]
         lint: ["v2.1.6"]
     name: lint
     runs-on: ubuntu-latest
diff --git a/go.mod b/go.mod
index 76b1336..2329d39 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,8 @@
 module github.com/simplesurance/cfdns
 
-go 1.21
-toolchain go1.24.1
+go 1.23.0
+
+toolchain go1.24.3
 
 require (
 	github.com/fatih/color v1.18.0
diff --git a/log/testtarget/testtarget.go b/log/testtarget/testtarget.go
index cc795ef..996182d 100644
--- a/log/testtarget/testtarget.go
+++ b/log/testtarget/testtarget.go
@@ -8,12 +8,12 @@ package testtarget
 
 import (
 	"fmt"
+	"maps"
 	"slices"
 	"strings"
 	"testing"
 
 	"github.com/fatih/color"
-	"golang.org/x/exp/maps"
 
 	"github.com/simplesurance/cfdns/log"
 )
@@ -38,7 +38,7 @@ func (t testDriver) Send(l *log.Entry) {
 
 	fmt.Fprintf(msg, "[%s] %s", l.Severity, l.Message)
 
-	keys := maps.Keys(l.Tags)
+	keys := slices.Collect(maps.Keys(l.Tags))
 	slices.Sort(keys)
 	for _, key := range keys {
 		fmt.Fprintf(msg, "\n- %s: %v", key, format(l.Tags[key]))
diff --git a/log/texttarget/textlogger.go b/log/texttarget/textlogger.go
index 9e5abaf..1304f22 100644
--- a/log/texttarget/textlogger.go
+++ b/log/texttarget/textlogger.go
@@ -8,12 +8,12 @@ package texttarget
 import (
 	"fmt"
 	"io"
+	"maps"
 	"slices"
 	"sync"
 	"time"
 
 	"github.com/fatih/color"
-	"golang.org/x/exp/maps"
 
 	"github.com/simplesurance/cfdns/log"
 )
@@ -66,7 +66,7 @@ func (l *logger) Send(entry *log.Entry) {
 
 	fmt.Fprint(w, msg)
 
-	keys := maps.Keys(entry.Tags)
+	keys := slices.Collect(maps.Keys(entry.Tags))
 	slices.Sort(keys)
 
 	for _, key := range keys {
diff --git a/request.go b/request.go
index 4deb238..00f73dc 100644
--- a/request.go
+++ b/request.go
@@ -2,11 +2,11 @@ package cfdns
 
 import (
 	"fmt"
+	"maps"
 	"net/http"
 	"net/url"
+	"slices"
 	"strings"
-
-	"golang.org/x/exp/maps"
 )
 
 type request struct {
@@ -33,7 +33,8 @@ func (e HTTPError) Error() string {
 	msg := &strings.Builder{}
 
 	fmt.Fprintf(msg, "HTTP %d\n", e.Code)
-	headers := maps.Keys(e.Headers)
+	headers := slices.Collect(maps.Keys(e.Headers))
+	slices.Sort(headers)
 	for _, k := range headers {
 		fmt.Fprintf(msg, "%s: %s\n", k, e.Headers.Get(k))
 	}