diff --git a/packages/doppler/packaging b/packages/doppler/packaging
index db5bb3230..d0269ee06 100644
--- a/packages/doppler/packaging
+++ b/packages/doppler/packaging
@@ -1,6 +1,6 @@
 set -ex
 
-source /var/vcap/packages/golang-1.21-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
 export GOPATH=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/doppler ./router/
diff --git a/packages/doppler/spec b/packages/doppler/spec
index 5f62d4a06..8895d740a 100644
--- a/packages/doppler/spec
+++ b/packages/doppler/spec
@@ -2,7 +2,7 @@
 name: doppler
 
 dependencies:
-- golang-1.21-linux
+- golang-1.22-linux
 
 files:
 - diodes/**/*.go
diff --git a/packages/golang-1.21-linux/spec.lock b/packages/golang-1.21-linux/spec.lock
deleted file mode 100644
index 2d0f6427f..000000000
--- a/packages/golang-1.21-linux/spec.lock
+++ /dev/null
@@ -1,2 +0,0 @@
-name: golang-1.21-linux
-fingerprint: 55147e471cfe150f63898ed1ae13b6cb48dac8f198d415319b14572ea7a55443
diff --git a/packages/loggregator_trafficcontroller/packaging b/packages/loggregator_trafficcontroller/packaging
index fe31dd34b..7ca1f486f 100644
--- a/packages/loggregator_trafficcontroller/packaging
+++ b/packages/loggregator_trafficcontroller/packaging
@@ -1,6 +1,6 @@
 set -ex
 
-source /var/vcap/packages/golang-1.21-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
 export GOPATH=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/trafficcontroller ./trafficcontroller/
diff --git a/packages/loggregator_trafficcontroller/spec b/packages/loggregator_trafficcontroller/spec
index 02e50bba4..43e124ee9 100644
--- a/packages/loggregator_trafficcontroller/spec
+++ b/packages/loggregator_trafficcontroller/spec
@@ -2,7 +2,7 @@
 name: loggregator_trafficcontroller
 
 dependencies:
-- golang-1.21-linux
+- golang-1.22-linux
 
 files:
 - metricemitter/**/*.go
diff --git a/packages/reverse_log_proxy/packaging b/packages/reverse_log_proxy/packaging
index 319e58d80..74e6321c7 100644
--- a/packages/reverse_log_proxy/packaging
+++ b/packages/reverse_log_proxy/packaging
@@ -1,6 +1,6 @@
 set -ex
 
-source /var/vcap/packages/golang-1.21-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
 export GOPATH=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/rlp ./rlp/
diff --git a/packages/reverse_log_proxy/spec b/packages/reverse_log_proxy/spec
index 95f6dbfe0..c3a103c56 100644
--- a/packages/reverse_log_proxy/spec
+++ b/packages/reverse_log_proxy/spec
@@ -2,7 +2,7 @@
 name: reverse_log_proxy
 
 dependencies:
-- golang-1.21-linux
+- golang-1.22-linux
 
 files:
 - metricemitter/**/*.go
diff --git a/packages/reverse_log_proxy_gateway/packaging b/packages/reverse_log_proxy_gateway/packaging
index 02bbb9169..ab7a03a77 100644
--- a/packages/reverse_log_proxy_gateway/packaging
+++ b/packages/reverse_log_proxy_gateway/packaging
@@ -1,6 +1,6 @@
 set -ex
 
-source /var/vcap/packages/golang-1.21-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
 export GOPATH=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/rlp-gateway ./rlp-gateway/
diff --git a/packages/reverse_log_proxy_gateway/spec b/packages/reverse_log_proxy_gateway/spec
index f9cb5d9b9..0b9608787 100644
--- a/packages/reverse_log_proxy_gateway/spec
+++ b/packages/reverse_log_proxy_gateway/spec
@@ -2,7 +2,7 @@
 name: reverse_log_proxy_gateway
 
 dependencies:
-- golang-1.21-linux
+- golang-1.22-linux
 
 files:
 - metricemitter/**/*.go
diff --git a/src/go.mod b/src/go.mod
index 66c128c20..27679679c 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -1,8 +1,6 @@
 module code.cloudfoundry.org/loggregator-release/src
 
-go 1.21.0
-
-toolchain go1.21.12
+go 1.22.0
 
 require (
 	code.cloudfoundry.org/go-batching v0.0.0-20240604201829-c8533406dd64