diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index ad9151b..77f335c 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -14,9 +14,9 @@ jobs:
     strategy:
       matrix:
         go:
-          - '1.21'
           - '1.22'
           - '1.23'
+          - '1.24'
       fail-fast: false
     steps:
       - name: Harden Runner
diff --git a/.renovaterc b/.renovaterc
index 3154c4c..6b41252 100644
--- a/.renovaterc
+++ b/.renovaterc
@@ -1,7 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "constraints": {
-    "go": "1.23"
+    "go": "1.24"
   },
   "extends": [
     "config:base",
diff --git a/README.md b/README.md
index 82cd186..4347521 100644
--- a/README.md
+++ b/README.md
@@ -32,13 +32,9 @@ go where their backwards compatibility when upgrading the compile tools is usual
 This policy means that users who wish to build this with older versions of go may find there are features being used
 which are not available in that version. The current intentionally supported versions of go are as follows:
 
+- go 1.24
+- go 1.23
 - go 1.22
-- go 1.21
-- ~~go 1.20~~:
-  - Go 1.20 support has been removed due to the new toolchain directive and lack of support in Go 1.20. This directive
-    is unfortunately being used in dependent libraries and we'd opt for ensuring we can easily obtain potential fixes
-    to CVE's rather than backwards compatibility. A such we have lifted the version requirement and implemented the
-    toolchain directive in our module to reflect the intended toolchain.
 
 ## Status
 
diff --git a/go.mod b/go.mod
index 14a675f..8f81de2 100644
--- a/go.mod
+++ b/go.mod
@@ -2,11 +2,11 @@ module github.com/go-webauthn/webauthn
 
 go 1.23.0
 
-toolchain go1.23.6
+toolchain go1.24.0
 
 require (
 	github.com/fxamacker/cbor/v2 v2.7.0
-	github.com/go-webauthn/x v0.1.17
+	github.com/go-webauthn/x v0.1.18
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/google/go-tpm v0.9.3
 	github.com/google/uuid v1.6.0
diff --git a/go.sum b/go.sum
index bf58f62..2f16329 100644
--- a/go.sum
+++ b/go.sum
@@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
 github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
-github.com/go-webauthn/x v0.1.17 h1:qMYS5yariiSHG8hBiaqX8349/XZsgo61IZPpxhRQo20=
-github.com/go-webauthn/x v0.1.17/go.mod h1:h908bkQi8OwBokf7OqNzt4i0cbhU9uhRbEsinZsFKoA=
+github.com/go-webauthn/x v0.1.18 h1:9xxiKRKCHx/1R2RF+4xb1qY5QDIO0RlTmH5L02lmRH4=
+github.com/go-webauthn/x v0.1.18/go.mod h1:Q/uHdGGFrZ7psEcoEStYunurZuG3Z9UDZJetM8qDTtA=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/google/go-tpm v0.9.3 h1:+yx0/anQuGzi+ssRqeD6WpXjW2L/V0dItUayO0i9sRc=