diff --git a/.github/workflows/go-check.yml b/.github/workflows/go-check.yml
index 889afd4bfe..c82b34a980 100644
--- a/.github/workflows/go-check.yml
+++ b/.github/workflows/go-check.yml
@@ -17,5 +17,5 @@ jobs:
   go-check:
     uses: ipdxco/unified-github-workflows/.github/workflows/go-check.yml@v1.0
     with:
-      go-version: "1.23.x"
+      go-version: "1.24.x"
       go-generate-ignore-protoc-version-comments: true
diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml
index 66cacd9928..c77bc74493 100644
--- a/.github/workflows/go-test.yml
+++ b/.github/workflows/go-test.yml
@@ -17,6 +17,6 @@ jobs:
   go-test:
     uses: ./.github/workflows/go-test-template.yml
     with:
-      go-versions: '["1.22.x", "1.23.x"]'
+      go-versions: '["1.23.x", "1.24.x"]'
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/core/crypto/pb/crypto.pb.go b/core/crypto/pb/crypto.pb.go
index d1f5437578..ef4d18dc76 100644
--- a/core/crypto/pb/crypto.pb.go
+++ b/core/crypto/pb/crypto.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: core/crypto/pb/crypto.proto
 
diff --git a/core/peer/pb/peer_record.pb.go b/core/peer/pb/peer_record.pb.go
index f43f8fc035..841bf97d2e 100644
--- a/core/peer/pb/peer_record.pb.go
+++ b/core/peer/pb/peer_record.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: core/peer/pb/peer_record.proto
 
diff --git a/core/record/pb/envelope.pb.go b/core/record/pb/envelope.pb.go
index e74cdde09d..33bd67f330 100644
--- a/core/record/pb/envelope.pb.go
+++ b/core/record/pb/envelope.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: core/record/pb/envelope.proto
 
diff --git a/core/sec/insecure/pb/plaintext.pb.go b/core/sec/insecure/pb/plaintext.pb.go
index 1baaf6dcf2..97e1864758 100644
--- a/core/sec/insecure/pb/plaintext.pb.go
+++ b/core/sec/insecure/pb/plaintext.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: core/sec/insecure/pb/plaintext.proto
 
diff --git a/examples/go.mod b/examples/go.mod
index a7cf80bfe4..997eca9220 100644
--- a/examples/go.mod
+++ b/examples/go.mod
@@ -1,8 +1,6 @@
 module github.com/libp2p/go-libp2p/examples
 
-go 1.22.0
-
-toolchain go1.22.1
+go 1.23
 
 require (
 	github.com/caddyserver/certmagic v0.21.6
diff --git a/examples/ipfs-camp-2019/go.mod b/examples/ipfs-camp-2019/go.mod
index 268135abab..7a52a1de0a 100644
--- a/examples/ipfs-camp-2019/go.mod
+++ b/examples/ipfs-camp-2019/go.mod
@@ -1,6 +1,6 @@
 module github.com/libp2p/go-libp2p/examples/ipfs-camp-2019
 
-go 1.22
+go 1.23
 
 require (
 	github.com/gogo/protobuf v1.3.2
diff --git a/examples/pubsub/basic-chat-with-rendezvous/go.mod b/examples/pubsub/basic-chat-with-rendezvous/go.mod
index c45d19866d..c03b5421d9 100644
--- a/examples/pubsub/basic-chat-with-rendezvous/go.mod
+++ b/examples/pubsub/basic-chat-with-rendezvous/go.mod
@@ -1,6 +1,6 @@
 module github.com/libp2p/go-libp2p/examples/pubsub/chat
 
-go 1.22
+go 1.23
 
 require (
 	github.com/libp2p/go-libp2p v0.33.0
diff --git a/examples/pubsub/chat/go.mod b/examples/pubsub/chat/go.mod
index 3f1e6c2f07..7157db7902 100644
--- a/examples/pubsub/chat/go.mod
+++ b/examples/pubsub/chat/go.mod
@@ -1,6 +1,6 @@
 module github.com/libp2p/go-libp2p/examples/pubsub/chat
 
-go 1.22
+go 1.23
 
 require (
 	github.com/gdamore/tcell/v2 v2.5.2
diff --git a/go.mod b/go.mod
index c09420f157..8e027dae27 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/libp2p/go-libp2p
 
-go 1.22.0
+go 1.23
 
 retract v0.26.1 // Tag was applied incorrectly due to a bug in the release workflow.
 
diff --git a/p2p/host/autonat/pb/autonat.pb.go b/p2p/host/autonat/pb/autonat.pb.go
index d1491a9812..0345d85e1a 100644
--- a/p2p/host/autonat/pb/autonat.pb.go
+++ b/p2p/host/autonat/pb/autonat.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: p2p/host/autonat/pb/autonat.proto
 
diff --git a/p2p/host/peerstore/pstoreds/pb/pstore.pb.go b/p2p/host/peerstore/pstoreds/pb/pstore.pb.go
index 6f7120bd5d..45a22c2a85 100644
--- a/p2p/host/peerstore/pstoreds/pb/pstore.pb.go
+++ b/p2p/host/peerstore/pstoreds/pb/pstore.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: p2p/host/peerstore/pstoreds/pb/pstore.proto
 
diff --git a/p2p/protocol/autonatv2/pb/autonatv2.pb.go b/p2p/protocol/autonatv2/pb/autonatv2.pb.go
index 32af81fff2..8e1207b3a8 100644
--- a/p2p/protocol/autonatv2/pb/autonatv2.pb.go
+++ b/p2p/protocol/autonatv2/pb/autonatv2.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: p2p/protocol/autonatv2/pb/autonatv2.proto
 
diff --git a/p2p/protocol/circuitv2/pb/circuit.pb.go b/p2p/protocol/circuitv2/pb/circuit.pb.go
index 8b1d754566..2ce4c66c48 100644
--- a/p2p/protocol/circuitv2/pb/circuit.pb.go
+++ b/p2p/protocol/circuitv2/pb/circuit.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: p2p/protocol/circuitv2/pb/circuit.proto
 
diff --git a/p2p/protocol/circuitv2/pb/voucher.pb.go b/p2p/protocol/circuitv2/pb/voucher.pb.go
index d659d5c685..19e6872aa5 100644
--- a/p2p/protocol/circuitv2/pb/voucher.pb.go
+++ b/p2p/protocol/circuitv2/pb/voucher.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: p2p/protocol/circuitv2/pb/voucher.proto
 
diff --git a/p2p/protocol/holepunch/pb/holepunch.pb.go b/p2p/protocol/holepunch/pb/holepunch.pb.go
index f6391fc9ed..07e78c07c5 100644
--- a/p2p/protocol/holepunch/pb/holepunch.pb.go
+++ b/p2p/protocol/holepunch/pb/holepunch.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: p2p/protocol/holepunch/pb/holepunch.proto
 
diff --git a/p2p/protocol/identify/pb/identify.pb.go b/p2p/protocol/identify/pb/identify.pb.go
index 7471cd86e3..1224d4feb3 100644
--- a/p2p/protocol/identify/pb/identify.pb.go
+++ b/p2p/protocol/identify/pb/identify.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: p2p/protocol/identify/pb/identify.proto
 
diff --git a/p2p/security/noise/pb/payload.pb.go b/p2p/security/noise/pb/payload.pb.go
index aae9765d25..e218cf52be 100644
--- a/p2p/security/noise/pb/payload.pb.go
+++ b/p2p/security/noise/pb/payload.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: p2p/security/noise/pb/payload.proto
 
diff --git a/p2p/transport/tcpreuse/dialer.go b/p2p/transport/tcpreuse/dialer.go
index ad634583ed..d6ea1fc6a0 100644
--- a/p2p/transport/tcpreuse/dialer.go
+++ b/p2p/transport/tcpreuse/dialer.go
@@ -2,6 +2,7 @@ package tcpreuse
 
 import (
 	"context"
+
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
 )
diff --git a/p2p/transport/webrtc/pb/message.pb.go b/p2p/transport/webrtc/pb/message.pb.go
index 6fc068b560..f598009702 100644
--- a/p2p/transport/webrtc/pb/message.pb.go
+++ b/p2p/transport/webrtc/pb/message.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        v5.29.2
 // source: p2p/transport/webrtc/pb/message.proto
 
diff --git a/scripts/test_analysis/go.mod b/scripts/test_analysis/go.mod
index 84ffc92b36..89f60f029e 100644
--- a/scripts/test_analysis/go.mod
+++ b/scripts/test_analysis/go.mod
@@ -1,6 +1,6 @@
 module github.com/libp2p/go-libp2p/scripts/test_analysis
 
-go 1.22
+go 1.23
 
 require github.com/glebarez/go-sqlite v1.22.0
 
diff --git a/test-plans/go.mod b/test-plans/go.mod
index 323db2aff2..5b513d3ba9 100644
--- a/test-plans/go.mod
+++ b/test-plans/go.mod
@@ -1,6 +1,6 @@
 module github.com/libp2p/go-libp2p/test-plans/m/v2
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/go-redis/redis/v8 v8.11.5