diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml
index 4de0e90731551..88a580668b852 100644
--- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml
+++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml
@@ -82,12 +82,14 @@ tests:
       COMPUTE_NODE_REPLICAS: "6"
       COMPUTE_NODE_TYPE: m6a.2xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge
+      DR__RP__CR_COMP_NAME: lp-interop--OPP
       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"]'
       FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com
       FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9181
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "true"
+      MAP_TESTS: "true"
       ODF_VERSION_MAJOR_MINOR: "5.0"
       OPERATORS: |
         [
@@ -103,6 +105,7 @@ tests:
     - ref: acm-tests-clc-destroy
     - ref: gather-aws-console
     - chain: ipi-deprovision
+    - ref: mpiit-data-router-reporter
     - ref: firewatch-report-issues
     pre:
     - ref: ipi-conf
@@ -146,12 +149,14 @@ tests:
     env:
       COMPUTE_NODE_REPLICAS: "6"
       DISABLE_ENVIRONMENT_CHECKER: "true"
+      DR__RP__CR_COMP_NAME: lp-interop--OPP
       FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-vsphere.json
       FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-vsphere-lp","opp-lp"]'
       FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com
       FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9181
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "true"
+      MAP_TESTS: "true"
       ODF_VERSION_MAJOR_MINOR: "5.0"
       OPENSHIFT_REQUIRED_CORES: "72"
       OPENSHIFT_REQUIRED_MEMORY: "288"
@@ -162,6 +167,13 @@ tests:
       SIZE_VARIANT: large
       TEST_IMPORTANCE: LEVEL0
       TEST_SCENARIOS: Cluster_Observability
+    post:
+    - ref: acm-fetch-operator-versions
+    - ref: acm-must-gather
+    - ref: mce-must-gather
+    - chain: ipi-vsphere-post
+    - ref: mpiit-data-router-reporter
+    - ref: firewatch-report-issues
     test:
     - ref: install-operators
     - ref: acm-mch
diff --git a/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-commands.sh b/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-commands.sh
index 19fab6dbd5596..6227554df8c11 100644
--- a/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-commands.sh
+++ b/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-commands.sh
@@ -14,7 +14,7 @@ if [ "${MAP_TESTS}" = "true" ]; then
                 ExitTrap--PostProcessPrep
         ' EXIT
     else
-        echo "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" >&2
+        : "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping"
     fi
 fi
 
diff --git a/ci-operator/step-registry/quay-tests/quay-interop-test/quay-tests-quay-interop-test-commands.sh b/ci-operator/step-registry/quay-tests/quay-interop-test/quay-tests-quay-interop-test-commands.sh
index 05b179b7b7563..4518602ae5d50 100644
--- a/ci-operator/step-registry/quay-tests/quay-interop-test/quay-tests-quay-interop-test-commands.sh
+++ b/ci-operator/step-registry/quay-tests/quay-interop-test/quay-tests-quay-interop-test-commands.sh
@@ -50,7 +50,7 @@ if [ "${MAP_TESTS}" = "true" ]; then
                 ExitTrap--PostProcessPrep
         ' EXIT
     else
-        echo "WARNING: ExitTrap--PostProcessPrep not available, falling back to copyArtifacts only" >&2
+        : "WARNING: ExitTrap--PostProcessPrep not available, falling back to copyArtifacts only"
         trap copyArtifacts EXIT
     fi
 else