diff --git a/Dockerfile.assisted-service b/Dockerfile.assisted-service
index e7f06a4ff20..49b761a2446 100644
--- a/Dockerfile.assisted-service
+++ b/Dockerfile.assisted-service
@@ -1,6 +1,6 @@
 ARG RHEL_VERSION=9
 
-FROM registry.access.redhat.com/ubi$RHEL_VERSION/go-toolset:1.21 AS golang
+FROM registry.access.redhat.com/ubi$RHEL_VERSION/go-toolset:1.22.5 AS golang
 
 ADD . /app
 WORKDIR /app
diff --git a/Dockerfile.assisted-service-build b/Dockerfile.assisted-service-build
index 24c4f3d0f18..7bf396fa695 100644
--- a/Dockerfile.assisted-service-build
+++ b/Dockerfile.assisted-service-build
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.21 AS golang
+FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5 AS golang
 
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.0
 RUN go install gotest.tools/gotestsum@latest
diff --git a/Dockerfile.assisted-service-debug b/Dockerfile.assisted-service-debug
index 3b1fc822c76..21323482eda 100644
--- a/Dockerfile.assisted-service-debug
+++ b/Dockerfile.assisted-service-debug
@@ -1,6 +1,6 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.21 AS golang
+FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5 AS golang
 
-RUN GOFLAGS=-mod=mod go install github.com/go-delve/delve/cmd/dlv@v1.21.2
+RUN GOFLAGS=-mod=mod go install github.com/go-delve/delve/cmd/dlv@v1.22.1
 
 FROM quay.io/centos/centos:stream9 AS builder
 
diff --git a/ci-images/Dockerfile.base b/ci-images/Dockerfile.base
index 73facf93e47..2bbe3b07b1e 100644
--- a/ci-images/Dockerfile.base
+++ b/ci-images/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.21 AS golang
+FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5 AS golang
 
 RUN go install gotest.tools/gotestsum@latest
 
diff --git a/go.mod b/go.mod
index 8c8105e35fe..2d9ff5693d1 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/assisted-service
 
-go 1.21
+go 1.22
 
 require (
 	github.com/IBM/netaddr v1.5.0