diff --git a/packages/golang-1.21-linux/spec.lock b/packages/golang-1.21-linux/spec.lock
deleted file mode 100644
index 2d0f642..0000000
--- 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/system-metrics-plugin/packaging b/packages/system-metrics-plugin/packaging
index e4281c7..789f0da 100644
--- a/packages/system-metrics-plugin/packaging
+++ b/packages/system-metrics-plugin/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 -mod=vendor -o ${BOSH_INSTALL_TARGET}/system-metrics-plugin ./cmd/plugin/
diff --git a/packages/system-metrics-plugin/spec b/packages/system-metrics-plugin/spec
index 50d0e66..9be814b 100644
--- a/packages/system-metrics-plugin/spec
+++ b/packages/system-metrics-plugin/spec
@@ -2,7 +2,7 @@
 name: system-metrics-plugin
 
 dependencies:
-- golang-1.21-linux
+- golang-1.22-linux
 
 files:
 - "**/*"
diff --git a/packages/system-metrics-server/packaging b/packages/system-metrics-server/packaging
index 4e783c1..e49bcc6 100644
--- a/packages/system-metrics-server/packaging
+++ b/packages/system-metrics-server/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 -mod=vendor -o ${BOSH_INSTALL_TARGET}/system-metrics-server ./cmd/server/
diff --git a/packages/system-metrics-server/spec b/packages/system-metrics-server/spec
index 787055e..4ec29b4 100644
--- a/packages/system-metrics-server/spec
+++ b/packages/system-metrics-server/spec
@@ -2,7 +2,7 @@
 name: system-metrics-server
 
 dependencies:
-- golang-1.21-linux
+- golang-1.22-linux
 
 files:
 - "**/*"
diff --git a/src/go.mod b/src/go.mod
index c586e35..ffda86d 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -1,8 +1,6 @@
 module github.com/cloudfoundry/bosh-system-metrics-server
 
-go 1.21.0
-
-toolchain go1.21.12
+go 1.22.0
 
 require (
 	github.com/golang/protobuf v1.5.4