diff --git a/Dockerfile.assisted-service b/Dockerfile.assisted-service
index 601019fb86d..8adfcf8c2ef 100644
--- a/Dockerfile.assisted-service
+++ b/Dockerfile.assisted-service
@@ -5,7 +5,7 @@ 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.17 as pybuilder
 COPY . /assisted-service
 COPY --from=swagger_py /build /assisted-service/build
 RUN python3 -m pip install -I pip && pip3 install -I -r /assisted-service/dev-requirements.txt
@@ -14,7 +14,7 @@ RUN cd /assisted-service/build && python3 ../tools/client_package_initializer.py
 # 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.17 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-debug b/Dockerfile.assisted-service-debug
index 59d5af39e7b..6c522871ab7 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.17 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..5694924cf54 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.17 as build
 
 ENV GO111MODULE=on
 ENV GOFLAGS=""