diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__ocp-5.0-lpMainline-lp-interop--opp.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__ocp-5.0-lpMainline-lp-interop--opp.yaml
index b23397671a5de..2c8482181927a 100644
--- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__ocp-5.0-lpMainline-lp-interop--opp.yaml
+++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__ocp-5.0-lpMainline-lp-interop--opp.yaml
@@ -143,7 +143,7 @@ tests:
     - ref: interop-opp-odf-health
     - ref: interop-tests-opp-quay-smoke
     - ref: interop-opp-skip-ratio-gate
-- as: interop-opp-vsphere
+- as: cr--full-stack--vsphere
   capabilities:
   - intranet
   cluster: vsphere02
@@ -203,7 +203,7 @@ tests:
     - ref: acm-opp-app
     - ref: interop-opp-skip-ratio-gate
     workflow: acm-ipi-vsphere
-- as: cr--full-stack--fips--aws
+- as: full-stack--fips--aws
   capabilities:
   - intranet
   cluster: build05
@@ -226,7 +226,6 @@ tests:
       COMPUTE_NODE_REPLICAS: "6"
       COMPUTE_NODE_TYPE: m6a.2xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge
-      DR__RP__CR_COMP_NAME: lp-interop--OPP
       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: '["5.0-lp","opp-aws-lp","opp-lp","fips"]'
@@ -270,7 +269,6 @@ tests:
     - ref: acm-opp-app
     - ref: interop-opp-odf-health
     - ref: interop-tests-opp-quay-smoke
-    - ref: interop-opp-skip-ratio-gate
 zz_generated_metadata:
   branch: master
   org: RedHatQE
diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__ocp-5.1-lpMainline-lp-interop--opp.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__ocp-5.1-lpMainline-lp-interop--opp.yaml
index 2fc409b8d5ce6..4340ef7755e56 100644
--- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__ocp-5.1-lpMainline-lp-interop--opp.yaml
+++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__ocp-5.1-lpMainline-lp-interop--opp.yaml
@@ -137,7 +137,7 @@ tests:
     - ref: acm-opp-app
     - ref: interop-tests-opp-quay-smoke
     - ref: interop-opp-skip-ratio-gate
-- as: interop-opp-vsphere
+- as: cr--full-stack--vsphere
   capabilities:
   - intranet
   cluster: vsphere02
@@ -196,7 +196,7 @@ tests:
     - ref: acm-opp-app
     - ref: interop-opp-skip-ratio-gate
     workflow: acm-ipi-vsphere
-- as: cr--full-stack--fips--aws
+- as: full-stack--fips--aws
   capabilities:
   - intranet
   cluster: build05
@@ -219,7 +219,6 @@ tests:
       COMPUTE_NODE_REPLICAS: "6"
       COMPUTE_NODE_TYPE: m6a.2xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge
-      DR__RP__CR_COMP_NAME: lp-interop--OPP
       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: '["5.1-lp","opp-aws-lp","opp-lp","fips"]'
@@ -261,7 +260,6 @@ tests:
     - ref: acm-fetch-managed-clusters
     - ref: acm-opp-app
     - ref: interop-tests-opp-quay-smoke
-    - ref: interop-opp-skip-ratio-gate
 zz_generated_metadata:
   branch: master
   org: RedHatQE
diff --git a/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-periodics.yaml b/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-periodics.yaml
index 46f779f6095cf..8c3db9d2ebd02 100644
--- a/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-periodics.yaml
+++ b/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-periodics.yaml
@@ -2302,17 +2302,6 @@ periodics:
     job-release: "4.22"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-RedHatQE-interop-testing-master-ocp-4.22-lpMainline-lp-interop--acm-virt--eus-upgrade-from-4.20-cr--n2-upgrade--cpou--aws
-  reporter_config:
-    slack:
-      channel: '#forum-p2p-cspi'
-      job_states_to_report:
-      - success
-      - failure
-      - error
-      report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
-        ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
-        Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-        logs> {{end}}'
   spec:
     containers:
     - args:
@@ -2857,8 +2846,8 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build05
-  cron: 0 5,17 * * *
+  cluster: vsphere02
+  cron: 0 3,15 * * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -2868,14 +2857,14 @@ periodics:
     repo: interop-testing
   labels:
     capability/intranet: intranet
-    ci-operator.openshift.io/cloud: aws
-    ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe
-    ci-operator.openshift.io/cluster: build05
+    ci-operator.openshift.io/cloud: vsphere
+    ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
+    ci-operator.openshift.io/cluster: vsphere02
     ci-operator.openshift.io/variant: ocp-5.0-lpMainline-lp-interop--opp
     ci.openshift.io/generator: prowgen
     job-release: "5.0"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.0-lpMainline-lp-interop--opp-cr--full-stack--fips--aws
+  name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.0-lpMainline-lp-interop--opp-cr--full-stack--vsphere
   reporter_config:
     slack:
       channel: '#opp-discussion'
@@ -2899,7 +2888,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=cr--full-stack--fips--aws
+      - --target=cr--full-stack--vsphere
       - --variant=ocp-5.0-lpMainline-lp-interop--opp
       command:
       - ci-operator
@@ -2972,8 +2961,8 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: vsphere02
-  cron: 0 3,15 * * *
+  cluster: build05
+  cron: 0 5,17 * * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -2983,14 +2972,14 @@ periodics:
     repo: interop-testing
   labels:
     capability/intranet: intranet
-    ci-operator.openshift.io/cloud: vsphere
-    ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
-    ci-operator.openshift.io/cluster: vsphere02
+    ci-operator.openshift.io/cloud: aws
+    ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe
+    ci-operator.openshift.io/cluster: build05
     ci-operator.openshift.io/variant: ocp-5.0-lpMainline-lp-interop--opp
     ci.openshift.io/generator: prowgen
     job-release: "5.0"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.0-lpMainline-lp-interop--opp-interop-opp-vsphere
+  name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.0-lpMainline-lp-interop--opp-full-stack--fips--aws
   reporter_config:
     slack:
       channel: '#opp-discussion'
@@ -3014,7 +3003,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=interop-opp-vsphere
+      - --target=full-stack--fips--aws
       - --variant=ocp-5.0-lpMainline-lp-interop--opp
       command:
       - ci-operator
@@ -3202,8 +3191,8 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build05
-  cron: 30 5,17 * * *
+  cluster: vsphere02
+  cron: 0 3,15 * * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -3213,14 +3202,14 @@ periodics:
     repo: interop-testing
   labels:
     capability/intranet: intranet
-    ci-operator.openshift.io/cloud: aws
-    ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe
-    ci-operator.openshift.io/cluster: build05
+    ci-operator.openshift.io/cloud: vsphere
+    ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
+    ci-operator.openshift.io/cluster: vsphere02
     ci-operator.openshift.io/variant: ocp-5.1-lpMainline-lp-interop--opp
     ci.openshift.io/generator: prowgen
     job-release: "5.1"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.1-lpMainline-lp-interop--opp-cr--full-stack--fips--aws
+  name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.1-lpMainline-lp-interop--opp-cr--full-stack--vsphere
   reporter_config:
     slack:
       channel: '#opp-discussion'
@@ -3244,7 +3233,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=cr--full-stack--fips--aws
+      - --target=cr--full-stack--vsphere
       - --variant=ocp-5.1-lpMainline-lp-interop--opp
       command:
       - ci-operator
@@ -3317,8 +3306,8 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: vsphere02
-  cron: 0 3,15 * * *
+  cluster: build05
+  cron: 30 5,17 * * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -3328,14 +3317,14 @@ periodics:
     repo: interop-testing
   labels:
     capability/intranet: intranet
-    ci-operator.openshift.io/cloud: vsphere
-    ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
-    ci-operator.openshift.io/cluster: vsphere02
+    ci-operator.openshift.io/cloud: aws
+    ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe
+    ci-operator.openshift.io/cluster: build05
     ci-operator.openshift.io/variant: ocp-5.1-lpMainline-lp-interop--opp
     ci.openshift.io/generator: prowgen
     job-release: "5.1"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.1-lpMainline-lp-interop--opp-interop-opp-vsphere
+  name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.1-lpMainline-lp-interop--opp-full-stack--fips--aws
   reporter_config:
     slack:
       channel: '#opp-discussion'
@@ -3359,7 +3348,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=interop-opp-vsphere
+      - --target=full-stack--fips--aws
       - --variant=ocp-5.1-lpMainline-lp-interop--opp
       command:
       - ci-operator