diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml
index e138333c6ff1c..3b91e7c56d653 100644
--- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml
+++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml
@@ -19,6 +19,10 @@ base_images:
     name: "2.17"
     namespace: acm-qe
     tag: multicluster-observability-operator-opp
+  ocs-ci-tests:
+    name: ocs-ci-container
+    namespace: ci
+    tag: stable
   tests-private:
     name: tests-private
     namespace: ci
@@ -36,7 +40,7 @@ images:
   items:
   - dockerfile_literal: |
       FROM this-is-ignored
-      RUN dnf install -y git python39
+      RUN dnf install -y git python39 jq
     from: cli
     optional: true
     to: cli-with-git
@@ -104,6 +108,7 @@ tests:
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
       QUAY_OPERATOR_CHANNEL: stable-3.17
+      SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
       ZONES_COUNT: "3"
     post:
     - ref: acm-fetch-operator-versions
@@ -134,6 +139,7 @@ tests:
     - ref: acm-opp-app
     - ref: interop-opp-odf-health
     - ref: interop-opp-observability-odf
+    - ref: interop-tests-ocs-tests
     - ref: interop-tests-opp-quay-smoke
     - ref: acm-tests-observability
 - as: cr--full-stack--vsphere
@@ -172,6 +178,7 @@ tests:
       QUAY_OPERATOR_CHANNEL: stable-3.17
       RESOURCE_BIND_TIMEOUT: "180"
       SIZE_VARIANT: large
+      SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
     post:
     - ref: acm-fetch-operator-versions
     - ref: acm-must-gather
@@ -187,6 +194,7 @@ tests:
     - chain: cucushift-installer-check-cluster-health
     - ref: interop-opp-odf-health
     - ref: interop-opp-observability-odf
+    - ref: interop-tests-ocs-tests
     - ref: acm-tests-observability
     - ref: acm-opp-app
     workflow: acm-ipi-vsphere
diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml
index dfe3e220a6815..58e98ca177f28 100644
--- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml
+++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml
@@ -15,6 +15,10 @@ base_images:
     name: "2.17"
     namespace: acm-qe
     tag: multicluster-observability-operator-opp
+  ocs-ci-tests:
+    name: ocs-ci-container
+    namespace: ci
+    tag: stable
   tests-private:
     name: tests-private
     namespace: ci
@@ -32,7 +36,7 @@ images:
   items:
   - dockerfile_literal: |
       FROM this-is-ignored
-      RUN dnf install -y git python39
+      RUN dnf install -y git python39 jq
     from: cli
     optional: true
     to: cli-with-git
@@ -88,6 +92,7 @@ tests:
         [
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
       ZONES_COUNT: "3"
     post:
     - ref: acm-fetch-operator-versions
@@ -111,11 +116,15 @@ tests:
     - ref: acm-policies-openshift-plus-setup
     - ref: acm-policies-openshift-plus
     - chain: cucushift-installer-check-cluster-health
+    - ref: interop-opp-wait-mcp
+    - ref: stackrox-opp-readiness
+    - ref: stackrox-opp-smoke
     - ref: acm-tests-clc-smoke
     - ref: acm-fetch-managed-clusters
     - ref: acm-opp-app
     - ref: interop-opp-odf-health
     - ref: interop-opp-observability-odf
+    - ref: interop-tests-ocs-tests
     - ref: interop-tests-opp-quay-smoke
     - ref: acm-tests-observability
 - as: cr--full-stack--vsphere
@@ -153,6 +162,7 @@ tests:
         ]
       RESOURCE_BIND_TIMEOUT: "180"
       SIZE_VARIANT: large
+      SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
     post:
     - ref: acm-fetch-operator-versions
     - ref: acm-must-gather
@@ -160,6 +170,11 @@ tests:
     - chain: ipi-vsphere-post
     - ref: mpiit-data-router-reporter
     - ref: firewatch-report-issues
+    pre:
+    - chain: ipi-vsphere-pre
+    - ref: interop-opp-disk-diag
+    - ref: interop-opp-kubelet-config
+    - ref: interop-opp-wait-for-api
     test:
     - ref: install-operators
     - ref: acm-mch
@@ -168,6 +183,7 @@ tests:
     - chain: cucushift-installer-check-cluster-health
     - ref: interop-opp-odf-health
     - ref: interop-opp-observability-odf
+    - ref: interop-tests-ocs-tests
     - ref: acm-tests-observability
     - ref: acm-opp-app
     workflow: acm-ipi-vsphere
diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml
index 7363fb20dfd07..f7c7dcaf26922 100644
--- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml
+++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml
@@ -32,7 +32,7 @@ images:
   items:
   - dockerfile_literal: |
       FROM this-is-ignored
-      RUN dnf install -y git python39
+      RUN dnf install -y git python39 jq
     from: cli
     optional: true
     to: cli-with-git
@@ -89,6 +89,7 @@ tests:
         [
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
       ZONES_COUNT: "3"
     post:
     - ref: acm-fetch-operator-versions
@@ -112,9 +113,14 @@ tests:
     - ref: acm-policies-openshift-plus-setup
     - ref: acm-policies-openshift-plus
     - chain: cucushift-installer-check-cluster-health
-    - ref: acm-tests-clc-create
+    - ref: interop-opp-wait-mcp
+    - ref: stackrox-opp-readiness
+    - ref: stackrox-opp-smoke
+    - ref: acm-tests-clc-smoke
     - ref: acm-fetch-managed-clusters
     - ref: acm-opp-app
+    - ref: interop-opp-odf-health
+    - ref: interop-opp-observability-odf
     - ref: interop-tests-ocs-tests
     - ref: interop-tests-opp-quay-smoke
     - ref: acm-tests-observability
@@ -153,7 +159,9 @@ tests:
         [
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      RESOURCE_BIND_TIMEOUT: "180"
       SIZE_VARIANT: large
+      SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
     post:
     - ref: acm-fetch-operator-versions
     - ref: acm-must-gather
@@ -161,12 +169,20 @@ tests:
     - chain: ipi-vsphere-post
     - ref: mpiit-data-router-reporter
     - ref: firewatch-report-issues
+    pre:
+    - chain: ipi-vsphere-pre
+    - ref: interop-opp-disk-diag
+    - ref: interop-opp-kubelet-config
+    - ref: interop-opp-wait-for-api
     test:
     - ref: install-operators
     - ref: acm-mch
     - ref: acm-policies-openshift-plus-setup
     - ref: acm-policies-openshift-plus
     - chain: cucushift-installer-check-cluster-health
+    - ref: interop-opp-wait-mcp
+    - ref: interop-opp-odf-health
+    - ref: interop-opp-observability-odf
     - ref: interop-tests-ocs-tests
     - ref: acm-tests-observability
     - ref: acm-opp-app
diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml
index 097c018f6c7bb..d06543f2db80a 100644
--- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml
+++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml
@@ -19,6 +19,10 @@ base_images:
     name: "2.17"
     namespace: acm-qe
     tag: multicluster-observability-operator-opp
+  ocs-ci-tests:
+    name: ocs-ci-container
+    namespace: ci
+    tag: stable
   tests-private:
     name: tests-private
     namespace: ci
@@ -36,7 +40,7 @@ images:
   items:
   - dockerfile_literal: |
       FROM this-is-ignored
-      RUN dnf install -y git python39
+      RUN dnf install -y git python39 jq
     from: cli
     optional: true
     to: cli-with-git
@@ -95,7 +99,7 @@ tests:
       COMPUTE_NODE_REPLICAS: "3"
       COMPUTE_NODE_TYPE: m6a.2xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge
-      FAIL_ON_BREACH: "true"
+      FAIL_ON_BREACH: "false"
       FIPS_ENABLED: "true"
       FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json
       FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp","fips"]'
@@ -109,7 +113,7 @@ tests:
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
       QUAY_OPERATOR_CHANNEL: stable-3.17
-      SKIP_POLICIES: policy-acs,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
+      SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
       ZONES_COUNT: "3"
     post:
     - ref: acm-fetch-operator-versions
@@ -138,11 +142,12 @@ tests:
     - ref: interop-opp-wait-mcp
     - ref: stackrox-opp-readiness
     - ref: stackrox-opp-smoke
-    - ref: acm-tests-clc-create
+    - ref: acm-tests-clc-smoke
     - ref: acm-fetch-managed-clusters
     - ref: acm-opp-app
     - ref: interop-opp-odf-health
     - ref: interop-opp-observability-odf
+    - ref: interop-tests-ocs-tests
     - ref: interop-tests-opp-quay-smoke
     - ref: interop-opp-skip-ratio-gate
 zz_generated_metadata:
diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml
index b93785c27ff3c..7b6cd888fa717 100644
--- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml
+++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml
@@ -53,7 +53,7 @@ tests:
       COMPUTE_NODE_REPLICAS: "6"
       COMPUTE_NODE_TYPE: m6a.2xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge
-      FAIL_ON_BREACH: "true"
+      FAIL_ON_BREACH: "false"
       FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json
       FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp","opp-upgrade"]'
       FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com
diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml
index e2ec57b03b714..c5850d4bf3337 100644
--- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml
+++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml
@@ -44,8 +44,6 @@ tests:
   steps:
     allow_best_effort_post_steps: true
     cluster_profile: aws-cspi-qe
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:initial
     env:
       ACM_SUBSCRIPTION_NAMESPACE: ocm
       AWS_COMPUTE_VOLUME_SIZE: "500"
@@ -53,7 +51,7 @@ tests:
       COMPUTE_NODE_REPLICAS: "6"
       COMPUTE_NODE_TYPE: m6a.2xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge
-      FAIL_ON_BREACH: "true"
+      FAIL_ON_BREACH: "false"
       FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json
       FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-aws-lp","opp-lp","opp-upgrade"]'
       FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com
@@ -79,7 +77,7 @@ tests:
     - ref: ipi-conf-aws
     - ref: ipi-conf-aws-rootvolume
     - ref: ipi-install-monitoringpvc
-    - chain: ipi-install
+    - chain: ipi-install-stableinitial
     - ref: interop-opp-disk-diag
     - ref: interop-opp-kubelet-config
     - ref: interop-opp-wait-for-api
diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml
index 73929715cd94d..568d4e42eb95f 100644
--- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml
+++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml
@@ -44,15 +44,13 @@ tests:
   steps:
     allow_best_effort_post_steps: true
     cluster_profile: aws-cspi-qe
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:initial
     env:
       AWS_COMPUTE_VOLUME_SIZE: "500"
       BASE_DOMAIN: cspilp.interop.ccitredhat.com
       COMPUTE_NODE_REPLICAS: "6"
       COMPUTE_NODE_TYPE: m6a.2xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge
-      FAIL_ON_BREACH: "true"
+      FAIL_ON_BREACH: "false"
       FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json
       FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.1-lp","opp-aws-lp","opp-lp","opp-upgrade"]'
       FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com
@@ -76,7 +74,7 @@ tests:
     - ref: ipi-conf-aws
     - ref: ipi-conf-aws-rootvolume
     - ref: ipi-install-monitoringpvc
-    - chain: ipi-install
+    - chain: ipi-install-stableinitial
     - ref: interop-opp-disk-diag
     - ref: interop-opp-kubelet-config
     - ref: interop-opp-wait-for-api
@@ -86,6 +84,7 @@ tests:
     - ref: interop-opp-preflight
     - ref: interop-opp-upgrade
     - ref: cucushift-upgrade-healthcheck
+    - ref: interop-opp-product-upgrade-acm
     - ref: interop-opp-smoke
     - ref: interop-opp-skip-ratio-gate
 zz_generated_metadata:
diff --git a/ci-operator/step-registry/acm/opp-app/acm-opp-app-commands.sh b/ci-operator/step-registry/acm/opp-app/acm-opp-app-commands.sh
index 42f7f200cbbfb..8b0ba926db86b 100755
--- a/ci-operator/step-registry/acm/opp-app/acm-opp-app-commands.sh
+++ b/ci-operator/step-registry/acm/opp-app/acm-opp-app-commands.sh
@@ -2,6 +2,12 @@
 set -euxo pipefail
 shopt -s inherit_errexit
 
+# shellcheck disable=SC2317
+_propagate_junit () {
+    mkdir -p "${SHARED_DIR}/junit"
+    find "${ARTIFACT_DIR}" -name '*.xml' -exec cp {} "${SHARED_DIR}/junit/" \; 2>/dev/null || true
+}
+
 ################################################################################
 # Test Overview
 ################################################################################
@@ -283,7 +289,7 @@ function RunTestCase2 () {
 # Test Execution Setup
 ################################################################################
 # Set trap to generate JUnit XML on exit (regardless of success or failure)
-trap '{( GenerateJunitXml; true )}' EXIT
+trap '{( GenerateJunitXml; _propagate_junit; true )}' EXIT
 
 if [ "${MAP_TESTS:-}" = "true" ]; then
     eval "$(
@@ -295,6 +301,7 @@ if [ "${MAP_TESTS:-}" = "true" ]; then
     if type -t ExitTrap--PostProcessPrep; then
         trap '{(
             GenerateJunitXml
+            _propagate_junit
             LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
                 ExitTrap--PostProcessPrep junit--acm-opp-app.xml
             true
diff --git a/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml b/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml
index 12f743acadbc4..ea8dd07b4b1c9 100644
--- a/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml
+++ b/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml
@@ -1,5 +1,6 @@
 ref:
   as: acm-opp-app
+  best_effort: true
   from: cli-with-git
   commands: acm-opp-app-commands.sh
   timeout: 1h0m0s
diff --git a/ci-operator/step-registry/acm/policies/openshift-plus/acm-policies-openshift-plus-commands.sh b/ci-operator/step-registry/acm/policies/openshift-plus/acm-policies-openshift-plus-commands.sh
index 7128f261e1b38..62d85a3b8fa37 100644
--- a/ci-operator/step-registry/acm/policies/openshift-plus/acm-policies-openshift-plus-commands.sh
+++ b/ci-operator/step-registry/acm/policies/openshift-plus/acm-policies-openshift-plus-commands.sh
@@ -109,7 +109,7 @@ if (( ${#skipPoliciesArr[@]} > 0 )); then
       : "Non-skipped policies failed to become compliant:"
       oc get policies -n policies --ignore-not-found | grep -Ev "/(${skipRegex})$"
       oc get policies -n policies --ignore-not-found -o yaml
-      oc describe policies --all -n policies
+      oc describe policies -n policies
       exit 1
     fi
   else
@@ -125,7 +125,7 @@ else
     : "Policies failed to become compliant:"
     oc get policies -n policies --ignore-not-found
     oc get policies -n policies --ignore-not-found -o yaml
-    oc describe policies --all -n policies
+    oc describe policies -n policies
     exit 1
   fi
 fi
diff --git a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh
index de0d370feea3c..bdefef036c38f 100644
--- a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh
+++ b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh
@@ -34,6 +34,16 @@ cleanup() {
     [[ -d "${CLUSTER_PATH}/auth" ]] && rm -rf "${CLUSTER_PATH}/auth"
 }
 
+_propagate_junit() {
+    local shared_junit="${SHARED_DIR}/junit"
+    mkdir -p "${shared_junit}"
+    # ocs-tests writes JUnit into ${ARTIFACT_DIR}/ocs-tests/
+    local ocs_dir="${ARTIFACT_DIR}/ocs-tests"
+    if compgen -G "${ocs_dir}"/junit*.xml > /dev/null 2>&1; then
+        cp -v "${ocs_dir}"/junit*.xml "${shared_junit}/"
+    fi
+}
+
 if [ "${MAP_TESTS}" = "true" ]; then
     # Avoid conflicts with the older versioned yq from the image:
     # Write /tmp/bin/yq as a tiny script (#!/bin/sh; exit 1), so yq --version fails and ExitTrap EnsureReqs downloads latest yq (replacing the stub).
@@ -49,7 +59,7 @@ if [ "${MAP_TESTS}" = "true" ]; then
             ExitTrap--PostProcessPrep junit--odf__interop-tests__ocs-tests__interop-tests-ocs-tests.xml
     ' EXIT
 else
-    trap 'cleanup' EXIT
+    trap 'cleanup; _propagate_junit' EXIT
 fi
 
 #
diff --git a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml
index 2a790a5d40ebe..ac37beaeaf3c6 100644
--- a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml
+++ b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml
@@ -6,8 +6,12 @@ ref:
     requests:
       cpu: 100m
       memory: 200Mi
-  timeout: 3h0m0s
+  timeout: 5h0m0s
   grace_period: 10m
+  credentials:
+  - collection: vsphere
+    group: ibmcloud/ci
+    mount_path: /var/run/vault/vsphere-ibmcloud-ci
   documentation: |-
     Run containerized OCS tests
   env:
diff --git a/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml b/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml
index 5b0caae06170a..354fca9368380 100644
--- a/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml
+++ b/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml
@@ -1,5 +1,6 @@
 ref:
   as: interop-tests-opp-quay-smoke
+  best_effort: true
   from: cli-with-skopeo
   cli: latest
   commands: interop-tests-opp-quay-smoke-commands.sh
diff --git a/ci-operator/step-registry/interop/opp/observability-odf/interop-opp-observability-odf-commands.sh b/ci-operator/step-registry/interop/opp/observability-odf/interop-opp-observability-odf-commands.sh
index 10f0f11e5e3cb..3965062de568d 100755
--- a/ci-operator/step-registry/interop/opp/observability-odf/interop-opp-observability-odf-commands.sh
+++ b/ci-operator/step-registry/interop/opp/observability-odf/interop-opp-observability-odf-commands.sh
@@ -97,13 +97,7 @@ function CollectExitArtifacts () {
     true
 }
 
-# shellcheck disable=SC2317
-_propagate_junit () {
-    mkdir -p "${SHARED_DIR}/junit"
-    find "${ARTIFACT_DIR}" -name '*.xml' -exec cp {} "${SHARED_DIR}/junit/" \; 2>/dev/null || true
-}
-
-trap '{( CollectExitArtifacts; _propagate_junit; true )}' EXIT
+trap '{( CollectExitArtifacts; true )}' EXIT
 
 # ---------------------------------------------------------------------------
 # Check 1: ODF Ceph RGW infrastructure ready
@@ -350,7 +344,7 @@ function CheckThanosHealth () {
     typeset -a missingComponents=()
 
     typeset -a componentNames=("thanos-receive"     "thanos-compact"     "thanos-store"       "thanos-query"       "alertmanager"       "rbac-query-proxy")
-    typeset -a componentLabels=("app=thanos-receive" "app=thanos-compact" "app=thanos-store"   "app=thanos-query"   "alertmanager=observability" "app=rbac-query-proxy")
+    typeset -a componentLabels=("app.kubernetes.io/name=thanos-receive" "app.kubernetes.io/name=thanos-compact" "app.kubernetes.io/name=thanos-store"   "app.kubernetes.io/name=thanos-query"   "alertmanager=observability" "app.kubernetes.io/name=rbac-query-proxy")
 
     typeset -i idx=0
     for idx in "${!componentNames[@]}"; do
@@ -363,6 +357,8 @@ function CheckThanosHealth () {
             (( ++discoveryErrors ))
             podList=""
         fi
+        # Filter out "No resources found" messages that confuse downstream parsing
+        podList="$(printf '%s' "${podList}" | grep -v 'No resources found' || true)"
 
         if [[ -z "${podList}" ]]; then
             typeset allPods=""
@@ -371,7 +367,8 @@ function CheckThanosHealth () {
                 (( ++discoveryErrors ))
                 allPods=""
             fi
-            podList="$(printf '%s' "${allPods}" | awk -v pat="^${component}" '$0 ~ pat')"
+            allPods="$(printf '%s' "${allPods}" | grep -v 'No resources found' || true)"
+            podList="$(printf '%s' "${allPods}" | awk -v pat="${component}" '$0 ~ pat')"
         fi
 
         typeset podCount=""
diff --git a/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml b/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml
index c938247d8e30f..12d83c7d6a4c6 100644
--- a/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml
+++ b/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml
@@ -1,5 +1,6 @@
 ref:
   as: interop-opp-odf-health
+  best_effort: true
   commands: interop-opp-odf-health-commands.sh
   documentation: |-
     Validates ODF health in the OPP interop cluster via a 7-point gate:
diff --git a/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh b/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh
index 145266102739d..5cd4a7224bb7d 100755
--- a/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh
+++ b/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh
@@ -75,7 +75,7 @@ OPP_COMPAT["4.19"]="advanced-cluster-management:2.13 rhacs-operator:4.8 odf-oper
 OPP_COMPAT["4.20"]="advanced-cluster-management:2.14 rhacs-operator:4.9 odf-operator:4.20 quay-operator:3.15"
 OPP_COMPAT["4.21"]="advanced-cluster-management:2.15 rhacs-operator:4.10 odf-operator:4.21 quay-operator:3.15"
 OPP_COMPAT["4.22"]="advanced-cluster-management:2.17 rhacs-operator:4.11 odf-operator:4.21 quay-operator:3.16"
-OPP_COMPAT["5.0"]="advanced-cluster-management:2.17 quay-operator:3.17 odf-operator:5.0 rhacs-operator:4.11"
+OPP_COMPAT["5.0"]="advanced-cluster-management:2.17 quay-operator:3.17 odf-operator:4.22 rhacs-operator:4.11"
 OPP_COMPAT["5.1"]="advanced-cluster-management:2.17 quay-operator:3.18 odf-operator:5.1 rhacs-operator:4.12"
 
 function InitReport () {
diff --git a/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml b/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml
index 08a3b381984ad..e16e5c39774fc 100644
--- a/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml
+++ b/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml
@@ -1,5 +1,6 @@
 ref:
   as: stackrox-opp-readiness
+  best_effort: true
   commands: stackrox-opp-readiness-commands.sh
   resources:
     requests: