diff --git a/openshift/gpu-operator-with-precompiled-drivers.rst b/openshift/gpu-operator-with-precompiled-drivers.rst
index a623fb49e..28f3690e4 100644
--- a/openshift/gpu-operator-with-precompiled-drivers.rst
+++ b/openshift/gpu-operator-with-precompiled-drivers.rst
@@ -84,7 +84,7 @@ Perform the following steps to build a custom driver image for use with Red Hat
 
    .. code-block:: console
 
-      export OPENSHIFT_VERSION="4.12.13"
+      export OPENSHIFT_VERSION="4.18.24"
       export TARGET_ARCH="x86_64"
 
 #. Determine the Driver Toolkit (DTK) image for your target Red Hat OpenShift version and architecture:
@@ -115,7 +115,7 @@ Perform the following steps to build a custom driver image for use with Red Hat
       export CUDA_DIST=ubi${RHEL_MAJOR}
       export DRIVER_EPOCH=1
       export DRIVER_VERSION=525.105.17
-      export OS_TAG=rhcos4.12
+      export OS_TAG=rhcos4.18
 
 #. Build and push the image:
 
@@ -231,9 +231,9 @@ Using the CLI
    .. code-block:: console
 
       NAME                                                            READY   STATUS    RESTARTS   AGE
-      nvidia-driver-daemonset-4.18.0-372.51.1.el8_6-rhcos4.12-mlpd4   1/1     Running   0          44s
+      nvidia-driver-daemonset-<kernel-version>-rhcos4.18-mlpd4   1/1     Running   0          44s
 
-   Ensure that the pod names include a Linux kernel version number like ``4.18.0-372.51.1.el8_6``.
+   Ensure that the pod names include the Linux kernel version number in place of ``<kernel-version>``.
 
 ***************************************************
 Disabling Support for Precompiled Driver Containers
@@ -267,4 +267,4 @@ Perform the following steps to disable support for precompiled driver containers
       NAME                                                  READY   STATUS    RESTARTS   AGE
       nvidia-driver-daemonset-412.86.202303241612-0-f7v4t   2/2     Running   0          4m20s
 
-   Ensure that the pod names do not include a Linux kernel semantic version number.
\ No newline at end of file
+   Ensure that the pod names do not include a Linux kernel semantic version number.
diff --git a/openshift/openshift-virtualization.rst b/openshift/openshift-virtualization.rst
index 34add7559..7f716cc65 100644
--- a/openshift/openshift-virtualization.rst
+++ b/openshift/openshift-virtualization.rst
@@ -265,24 +265,31 @@ Use the following steps to build the vGPU Manager container and push it to a pri
    * ``OS_TAG`` - This must match the Guest OS version.
 
 .. note::
-   The driver container image tag for OpenShift has changed after the OCP 4.19 release.
+   The driver container image tag suffix varies by OpenShift release.
    Refer to `OpenShift Container Platform 4.19 Release Notes section 1.4.5 <https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/release_notes/ocp-4-19-release-notes#ocp-4-19-rhcos-split-layers_release-notes>`_,
    `RHEL Versions Utilized by RHEL CoreOS and OCP <https://access.redhat.com/articles/6907891>`_,
    and `Split RHCOS into layers: /etc/os-release <https://github.com/openshift/enhancements/blob/master/enhancements/rhcos/split-rhcos-into-layers.md#etcos-release>`_
    for more information.
 
 
-   For RedHat OpenShift 4.18 or earlier, specify ``rhcos4.x`` where _x_ is the supported minor OCP version.
+   For Red Hat OpenShift 4.18, specify ``rhcos4.18``.
 
    .. code-block:: console
 
          $ export PRIVATE_REGISTRY=my/private/registry VGPU_HOST_DRIVER_VERSION=580.82.07 OS_TAG=rhcos4.18
 
-   For OpenShift 4.19 and later, specify ``rhel9.6`` instead.
+   For OpenShift 4.19 through 4.21, specify ``rhel9.6``.
 
    .. code-block:: console
 
       $ export PRIVATE_REGISTRY=my/private/registry VGPU_HOST_DRIVER_VERSION=580.82.07 OS_TAG=rhel9.6
+
+   For OpenShift 4.22, specify ``rhel9.8``.
+
+   .. code-block:: console
+
+      $ export PRIVATE_REGISTRY=my/private/registry VGPU_HOST_DRIVER_VERSION=580.82.07 OS_TAG=rhel9.8
+
 .. note::
 
    The recommended registry to use is the Integrated OpenShift Container Platform registry.
diff --git a/openshift/steps-overview.rst b/openshift/steps-overview.rst
index e667d9d2e..de2d0a98b 100644
--- a/openshift/steps-overview.rst
+++ b/openshift/steps-overview.rst
@@ -16,10 +16,11 @@ Installation and Upgrade Overview on OpenShift
    Update your OCP cluster to version `4.18.24` or later, which includes a fix for the issue.
    Refer to `NVIDIA GPU Operator Validator Pod Error <https://access.redhat.com/solutions/7131271>`_ in the Red Hat Knowledgebase for more information.
 
-.. note:: The driver container image tag for OpenShift has changed after the OCP 4.19 release.
+.. note:: The driver container image tag suffix varies by OpenShift release.
 
-   - Before OCP 4.19: The driver image tag is formed with the suffix ``-rhcos4.17`` (such as with OCP 4.17).
-   - Starting OCP 4.19 and later: The driver image tag is formed with the suffix ``-rhel9.6`` (such as with OCP 4.19).
+   - OCP 4.18 uses the suffix ``-rhcos4.18``.
+   - OCP 4.19 through 4.21 use the suffix ``-rhel9.6``.
+   - OCP 4.22 uses the suffix ``-rhel9.8``.
 
    Refer to `OpenShift Container Platform 4.19 Release Notes section 1.4.5 <https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/release_notes/ocp-4-19-release-notes#ocp-4-19-rhcos-split-layers_release-notes>`_,
    `RHEL Versions Utilized by RHEL CoreOS and OCP <https://access.redhat.com/articles/6907891>`_,