diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
index b80ea4a1..7c76cfcc 100644
--- a/.github/workflows/development.yaml
+++ b/.github/workflows/development.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v5
         with:
-          go-version: ^1.22.7
+          go-version: ^1.22.8
       - name: Setup workspace
         run: cp go.work.dist go.work
       - name: Download golangci-lint installer
@@ -40,4 +40,4 @@ jobs:
           version: 2.3.1
           args: release --verbose --snapshot --clean
         env:
-          GO_VERSION: 1.22.7
+          GO_VERSION: 1.22.8
diff --git a/.github/workflows/prerelease.yaml b/.github/workflows/prerelease.yaml
index 492fc5c7..0cb197b7 100644
--- a/.github/workflows/prerelease.yaml
+++ b/.github/workflows/prerelease.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v5
         with:
-          go-version: ^1.22.7
+          go-version: ^1.22.8
       - name: Setup workspace
         run: cp go.work.dist go.work
       - name: Run GoReleaser for release
@@ -33,4 +33,4 @@ jobs:
           args: release --verbose --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-          GO_VERSION: 1.22.7
+          GO_VERSION: 1.22.8
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 87b99082..0e43ff52 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v5
         with:
-          go-version: ^1.22.7
+          go-version: ^1.22.8
       - name: Setup workspace
         run: cp go.work.dist go.work
       - name: Log in to Docker Hub
@@ -39,4 +39,4 @@ jobs:
           args: release --verbose --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-          GO_VERSION: 1.22.7
+          GO_VERSION: 1.22.8
diff --git a/.tool-versions b/.tool-versions
index dfec02a1..079dc631 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,5 +1,5 @@
 adr-tools 3.0.0
-golang 1.23.2
+golang 1.22.8
 golangci-lint 1.61.0
 goreleaser 2.3.1
 hadolint 2.12.0
diff --git a/Dockerfile b/Dockerfile
index aa5af77e..5b74be55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.3-alpine3.18 AS tools
+FROM golang:1.22.8-alpine3.20 AS tools
 
 COPY scripts/tools-golang.sh /tmp/tools-golang.sh
 
diff --git a/Makefile b/Makefile
index a2dcda35..f8235878 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ SHELL := /bin/bash
 # ----------------------------------------------------------------------------------------------------------------------
 
 _DOCKER_FILELINT_IMAGE=cytopia/file-lint:latest-0.8
-_DOCKER_GOLANG_IMAGE=golang:1.22.7
+_DOCKER_GOLANG_IMAGE=golang:1.22.8
 _DOCKER_GOLANGCI_LINT_IMAGE=golangci/golangci-lint:v1.61.0
 _DOCKER_HADOLINT_IMAGE=hadolint/hadolint:v2.12.0
 _DOCKER_JSONLINT_IMAGE=cytopia/jsonlint:1.6
diff --git a/go.mod b/go.mod
index 190d1f04..797649c1 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/atombender/go-jsonschema
 
 go 1.22.0
 
-toolchain go1.23.2
+toolchain go1.22.0
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/go.work.sum b/go.work.sum
index 6716c330..6fba2c66 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -19,6 +19,7 @@ golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -30,6 +31,8 @@ golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
 golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -42,5 +45,6 @@ golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps
 golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
 golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
 golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/tests/go.mod b/tests/go.mod
index b9a6e90d..ac2cba56 100644
--- a/tests/go.mod
+++ b/tests/go.mod
@@ -2,7 +2,7 @@ module github.com/atombender/go-jsonschema/tests
 
 go 1.22.0
 
-toolchain go1.22.7
+toolchain go1.22.0
 
 replace (
 	github.com/atombender/go-jsonschema => ../
diff --git a/tests/helpers/other/go.mod b/tests/helpers/other/go.mod
index 86527124..2c90d21d 100644
--- a/tests/helpers/other/go.mod
+++ b/tests/helpers/other/go.mod
@@ -1,3 +1,3 @@
 module github.com/atombender/go-jsonschema/tests/example/other
 
-go 1.22
+go 1.22.0