diff --git a/docker/eno-controller/Dockerfile b/docker/eno-controller/Dockerfile
index f70f0434..555cebf0 100644
--- a/docker/eno-controller/Dockerfile
+++ b/docker/eno-controller/Dockerfile
@@ -1,6 +1,10 @@
 FROM mcr.microsoft.com/devcontainers/go:1.24 AS builder
-# Set GOTOOLCHAIN to ensure the specific version is used during build for fix CVE-2025-68121
-ENV GOTOOLCHAIN=go1.24.13
+
+ENV GOTOOLCHAIN=auto
+
+# Disable workspace mode so go build uses the toolchain from go.mod
+ENV GOWORK=off
+
 WORKDIR /app
 
 ADD go.mod .
diff --git a/docker/eno-reconciler/Dockerfile b/docker/eno-reconciler/Dockerfile
index 5fb7d4d3..f93bb8f4 100644
--- a/docker/eno-reconciler/Dockerfile
+++ b/docker/eno-reconciler/Dockerfile
@@ -1,6 +1,10 @@
 FROM mcr.microsoft.com/devcontainers/go:1.24 AS builder
-# Set GOTOOLCHAIN to ensure the specific version is used during build for fix CVE-2025-68121
-ENV GOTOOLCHAIN=go1.24.13
+
+ENV GOTOOLCHAIN=auto
+
+# Disable workspace mode so go build uses the toolchain from go.mod
+ENV GOWORK=off
+
 WORKDIR /app
 
 ADD go.mod .
diff --git a/go.work b/go.work
index 45a4e2ab..b1966852 100644
--- a/go.work
+++ b/go.work
@@ -1,6 +1,6 @@
 go 1.24.0
 
-toolchain go1.24.3
+toolchain go1.24.13
 
 use (
 	.