diff --git a/Dockerfile.assisted-service b/Dockerfile.assisted-service
index 0d284e409e6..2ed8d5c8c4c 100644
--- a/Dockerfile.assisted-service
+++ b/Dockerfile.assisted-service
@@ -5,14 +5,14 @@ COPY tools/generate_python_client.sh .
 RUN chmod +x ./generate_python_client.sh && SWAGGER_FILE=swagger.yaml OUTPUT=/build ./generate_python_client.sh
 
 # TODO: Find a pure Python3 base image, rather than relying on the golang one
-FROM registry.ci.openshift.org/openshift/release:golang-1.16 as pybuilder
+FROM registry.ci.openshift.org/openshift/release:golang-1.18 as pybuilder
 COPY --from=swagger_py /build build
 RUN cd build && python3 setup.py sdist --dist-dir /assisted-service-client
 
 # TODO: Currently, the Python package is included in the service image for testing purposes. It conveniently allows matching a service version to a specific Python client version. In the future, once the Python package is published on pip, it should (probably) be removed from the Assisted Service image (this dockerfile).
 
 # Build binaries
-FROM registry.ci.openshift.org/openshift/release:golang-1.16 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.18 as builder
 # Bring in the go dependencies before anything else so we can take
 # advantage of caching these layers in future builds.
 COPY go.mod go.mod
diff --git a/Dockerfile.assisted-service-build b/Dockerfile.assisted-service-build
index 0ade0e96db5..d3f4e5a67ba 100644
--- a/Dockerfile.assisted-service-build
+++ b/Dockerfile.assisted-service-build
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/openshift/release:golang-1.16
+FROM registry.ci.openshift.org/openshift/release:golang-1.18
 
 ENV GO111MODULE=on
 ENV GOFLAGS=""
diff --git a/Dockerfile.assisted-service-debug b/Dockerfile.assisted-service-debug
index 59d5af39e7b..1f88b3ae95b 100644
--- a/Dockerfile.assisted-service-debug
+++ b/Dockerfile.assisted-service-debug
@@ -1,5 +1,5 @@
 ARG SERVICE=quay.io/ocpmetal/assisted-service:latest
-FROM registry.ci.openshift.org/openshift/release:golang-1.16 AS download_dlv
+FROM registry.ci.openshift.org/openshift/release:golang-1.18 AS download_dlv
 RUN go get github.com/go-delve/delve/cmd/dlv
 
 FROM $SERVICE
diff --git a/Dockerfile.bundle b/Dockerfile.bundle
index 67eeec008a1..c99e5047c42 100644
--- a/Dockerfile.bundle
+++ b/Dockerfile.bundle
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/openshift/release:golang-1.16 as build
+FROM registry.ci.openshift.org/openshift/release:golang-1.18 as build
 
 ENV GO111MODULE=on
 ENV GOFLAGS=""