diff --git a/ci-operator/step-registry/rosa/cluster/wait-ready/operators/rosa-cluster-wait-ready-operators-commands.sh b/ci-operator/step-registry/rosa/cluster/wait-ready/operators/rosa-cluster-wait-ready-operators-commands.sh
index 3bbff34048c0..5742d77c3449 100755
--- a/ci-operator/step-registry/rosa/cluster/wait-ready/operators/rosa-cluster-wait-ready-operators-commands.sh
+++ b/ci-operator/step-registry/rosa/cluster/wait-ready/operators/rosa-cluster-wait-ready-operators-commands.sh
@@ -66,13 +66,16 @@ else
   echo "All cluster operators ready after $(( ${end_time} - ${start_time} )) seconds"
 fi
 
-# Additionally, OSD has a job "osd-cluster-ready" that determines when
+# Additionally, non-HCP has a job "osd-cluster-ready" that determines when
 # the managed service operators are done and the cluster is truly ready.
 # Don't consider the cluster ready until that's done.
-while ! oc get job/osd-cluster-ready -n openshift-monitoring &>/dev/null; do
-  echo "Waiting for job/osd-cluster-ready to exist..."
-  sleep 30
-done
+if [[ "$HOSTED_CP" == "false" ]]
+then
+  while ! oc get job/osd-cluster-ready -n openshift-monitoring &>/dev/null; do
+    echo "Waiting for job/osd-cluster-ready to exist..."
+    sleep 30
+  done
 
-echo "Waiting for job/osd-cluster-ready to complete..."
-oc wait --for=condition=complete job/osd-cluster-ready -n openshift-monitoring --timeout=60m
+  echo "Waiting for job/osd-cluster-ready to complete..."
+  oc wait --for=condition=complete job/osd-cluster-ready -n openshift-monitoring --timeout=60m
+fi
diff --git a/ci-operator/step-registry/rosa/cluster/wait-ready/operators/rosa-cluster-wait-ready-operators-ref.yaml b/ci-operator/step-registry/rosa/cluster/wait-ready/operators/rosa-cluster-wait-ready-operators-ref.yaml
index ad279d4e5481..05c4d88fd9be 100644
--- a/ci-operator/step-registry/rosa/cluster/wait-ready/operators/rosa-cluster-wait-ready-operators-ref.yaml
+++ b/ci-operator/step-registry/rosa/cluster/wait-ready/operators/rosa-cluster-wait-ready-operators-ref.yaml
@@ -3,6 +3,10 @@ ref:
   from: rosa-aws-cli
   grace_period: 10m
   commands: rosa-cluster-wait-ready-operators-commands.sh
+  env:
+  - name: HOSTED_CP
+    default: "false"
+    documentation: Enable the use of hosted control planes (HyperShift).
   resources:
     requests:
       cpu: 100m