diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
index 33c105ede..b92dc609f 100644
--- a/.github/workflows/code-coverage.yml
+++ b/.github/workflows/code-coverage.yml
@@ -14,7 +14,7 @@ jobs:
       name: Set up Go 1.x
       uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
       with:
-        go-version: 1.23.6
+        go-version: 1.24.6
     -
       name: Set up Python 3.11
       uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa # v4.8.0
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 4530ac7ad..09b35f69a 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -15,7 +15,7 @@ jobs:
       name: Set up Go 1.x
       uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
       with:
-        go-version: 1.23.6
+        go-version: 1.24.6
     -
       name: Set up Python 3.11
       uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa # v4.8.0
diff --git a/build/Dockerfile b/build/Dockerfile
index 755f52cea..0aea696c8 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -14,7 +14,7 @@
 #
 
 # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9/go-toolset
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24.4-1753853351 as builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.24.6-1758501173 as builder
 ENV GOPATH=/go/
 USER root
 WORKDIR /devworkspace-operator
diff --git a/go.mod b/go.mod
index bad09dbd3..8cc773794 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/devfile/devworkspace-operator
 
 go 1.24.0
 
-toolchain go1.24.4
+toolchain go1.24.6
 
 require (
 	github.com/devfile/api/v2 v2.3.1-alpha.0.20250521155908-5c3d7b99d252
diff --git a/project-clone/Dockerfile b/project-clone/Dockerfile
index a63b19ace..0abf02dc9 100644
--- a/project-clone/Dockerfile
+++ b/project-clone/Dockerfile
@@ -15,7 +15,7 @@
 
 # Build the manager binary
 # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9/go-toolset
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24.4-1753853351 as builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.24.6-1758501173 as builder
 ARG TARGETARCH
 ARG TARGETOS
 ENV GOPATH=/go/