diff --git a/go.mod b/go.mod
index a0a5fb9a..5cd43d6c 100644
--- a/go.mod
+++ b/go.mod
@@ -218,5 +218,3 @@ replace github.com/lightninglabs/loop/swapserverrpc => ./swapserverrpc
 replace github.com/lightninglabs/loop/looprpc => ./looprpc
 
 go 1.23.9
-
-toolchain go1.24.0
diff --git a/looprpc/go.mod b/looprpc/go.mod
index 1356ae37..8cc7db45 100644
--- a/looprpc/go.mod
+++ b/looprpc/go.mod
@@ -1,8 +1,6 @@
 module github.com/lightninglabs/loop/looprpc
 
-go 1.23.6
-
-toolchain go1.23.7
+go 1.23.9
 
 require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
diff --git a/swapserverrpc/go.mod b/swapserverrpc/go.mod
index fe36dfa2..b62a572e 100644
--- a/swapserverrpc/go.mod
+++ b/swapserverrpc/go.mod
@@ -13,6 +13,4 @@ require (
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 )
 
-go 1.23.6
-
-toolchain go1.24.0
+go 1.23.9
diff --git a/tools/Dockerfile b/tools/Dockerfile
index 1cc3aacd..f192f1fe 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6
+FROM golang:1.23.9
 
 RUN apt-get update && apt-get install -y git
 ENV GOCACHE=/tmp/build/.cache
diff --git a/tools/go.mod b/tools/go.mod
index f2a06461..b787e0e1 100644
--- a/tools/go.mod
+++ b/tools/go.mod
@@ -1,8 +1,6 @@
 module github.com/lightninglabs/loop/tools
 
-go 1.23.0
-
-toolchain go1.23.7
+go 1.23.9
 
 require (
 	github.com/golangci/golangci-lint v1.64.6