diff --git a/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh b/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh
index da1c17f86e44e..15a25364e882f 100644
--- a/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh
+++ b/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh
@@ -74,6 +74,7 @@ caps_operator[NodeTuning]="node-tuning"
 caps_operator[MachineAPI]="machine-api control-plane-machine-set cluster-autoscaler"
 caps_operator[ImageRegistry]="image-registry"
 caps_operator[OperatorLifecycleManager]="operator-lifecycle-manager operator-lifecycle-manager-catalog operator-lifecycle-manager-packageserver"
+caps_operator[OperatorLifecycleManagerV1]="olm"
 caps_operator[CloudCredential]="cloud-credential"
 caps_operator[CloudControllerManager]="cloud-controller-manager"
 caps_operator[Ingress]="ingress"
@@ -93,7 +94,7 @@ v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry"
 v415=" ${v414} OperatorLifecycleManager CloudCredential"
 v416=" ${v415} CloudControllerManager Ingress"
 v417=" ${v416}"
-v418=" ${v417}"
+v418=" ${v417} OperatorLifecycleManagerV1" 
 latest_defined="v418"
 always_default="${!latest_defined}"
 # always enabled capabilities
diff --git a/ci-operator/step-registry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh b/ci-operator/step-registry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh
index 1f73a63d6a915..6394ff884450b 100644
--- a/ci-operator/step-registry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh
+++ b/ci-operator/step-registry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh
@@ -74,9 +74,15 @@ function get_caps_for_version_capset() {
     "v4.16")
     caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential CloudControllerManager Ingress"
     ;;
-    *)
+    "v4.17")
     caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential CloudControllerManager Ingress"
     ;;
+    "v4.18")
+    caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential CloudControllerManager Ingress OperatorLifecycleManagerV1"
+    ;;
+    *)
+    caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential CloudControllerManager Ingress OperatorLifecycleManagerV1"
+    ;;
     esac
 
     echo $caps_string
@@ -282,6 +288,7 @@ caps_operator[OperatorLifecycleManager]="operator-lifecycle-manager operator-lif
 caps_operator[CloudCredential]="cloud-credential"
 caps_operator[CloudControllerManager]="cloud-controller-manager"
 caps_operator[Ingress]="ingress"
+caps_operator[OperatorLifecycleManagerV1]="olm"
 
 # Mapping between optional capability and resources
 # Need update when new resource marks as optional
diff --git a/ci-operator/step-registry/ipi/conf/capability/additionalcaps/ipi-conf-capability-additionalcaps-commands.sh b/ci-operator/step-registry/ipi/conf/capability/additionalcaps/ipi-conf-capability-additionalcaps-commands.sh
index c7b9989fd063b..5ffb7d75a72dd 100644
--- a/ci-operator/step-registry/ipi/conf/capability/additionalcaps/ipi-conf-capability-additionalcaps-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/capability/additionalcaps/ipi-conf-capability-additionalcaps-commands.sh
@@ -65,7 +65,7 @@ v415=" ${v414} OperatorLifecycleManager CloudCredential"
 v416=" ${v415} CloudControllerManager Ingress"
 v417=" ${v416}"
 # shellcheck disable=SC2034
-v418=" ${v417}"
+v418=" ${v417} OperatorLifecycleManagerV1"
 latest_version="v418"
 
 # define capability dependency
diff --git a/ci-operator/step-registry/ipi/conf/capability/baselinecaps/vset/ipi-conf-capability-baselinecaps-vset-commands.sh b/ci-operator/step-registry/ipi/conf/capability/baselinecaps/vset/ipi-conf-capability-baselinecaps-vset-commands.sh
index 33209001551da..3e7e8372e442a 100644
--- a/ci-operator/step-registry/ipi/conf/capability/baselinecaps/vset/ipi-conf-capability-baselinecaps-vset-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/capability/baselinecaps/vset/ipi-conf-capability-baselinecaps-vset-commands.sh
@@ -68,7 +68,7 @@ v415=" ${v414} OperatorLifecycleManager CloudCredential"
 v416=" ${v415} CloudControllerManager Ingress"
 v417=" ${v416}"
 # shellcheck disable=SC2034
-v418=" ${v417}"
+v418=" ${v417} OperatorLifecycleManagerV1"
 latest_version="v418"
 
 # define capability dependency
diff --git a/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh b/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh
index 1d86aaab2f538..0e9f14677752d 100755
--- a/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh
@@ -61,7 +61,7 @@ v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry"
 v415=" ${v414} OperatorLifecycleManager CloudCredential"
 v416=" ${v415} CloudControllerManager Ingress"
 v417=" ${v416}"
-v418=" ${v417}"
+v418=" ${v417} OperatorLifecycleManagerV1"
 latest_defined="v418"
 always_default="${!latest_defined}"