diff --git a/config/serverless-operator.yaml b/config/serverless-operator.yaml
index eb1d5a9c..e46a490b 100644
--- a/config/serverless-operator.yaml
+++ b/config/serverless-operator.yaml
@@ -28,7 +28,7 @@ config:
       - customConfigs:
           enabled: true
           excludes:
-          - .*ocp-4.22-lp-interop.*
+          - .*ocp-4.22-lpGA-lp-ocp-compat.*
         skipE2EMatches:
         - ^kitchensink-upgrade$
         useClusterPool: true
@@ -98,7 +98,7 @@ config:
         customConfigs:
           enabled: true
           includes:
-          - .*ocp-4.22-lp-interop.*
+          - .*ocp-4.22-lpGA-lp-ocp-compat.*
         onDemand: true
         version: "4.22"
       - skipCron: true
@@ -380,16 +380,17 @@ repositories:
         branch: ""
         org: ""
         repo: ""
-  - name: ocp-4.22-lp-interop
+  - name: ocp-4.22-lpGA-lp-ocp-compat
     releaseBuildConfiguration:
       tests:
-      - as: cr-operator-e2e-aws
+      - as: cr--operator-e2e--aws
         cron: 0 3,15 * * *
         steps:
           cluster_profile: aws-cspi-qe
           env:
             BASE_DOMAIN: cspilp.interop.ccitredhat.com
             COMPUTE_NODE_REPLICAS: "6"
+            DR__RP__CR_COMP_NAME: lp-ocp-compat--Serverless
             FIREWATCH_CONFIG: |
               {
                 "failure_rules":
@@ -406,14 +407,33 @@ repositories:
             FIREWATCH_DEFAULT_JIRA_ASSIGNEE: maschmid@redhat.com
             FIREWATCH_DEFAULT_JIRA_PROJECT: SRVCOM
             OCP_VERSION: "4.22"
-            REPORTPORTAL_CMP: Serverless-lp-interop
             USER_TAGS: |
               scenario serverless
           test:
           - as: operator-e2e
-            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true
-              SKIP_SPOT_INSTANCES=true MAP_TESTS=true make test-e2e-with-kafka
+            commands: |
+              set -euxo pipefail; shopt -s inherit_errexit
+              eval "$(curl -fsSL https://raw.githubusercontent.com/RedHatQE/OpenShift-LP-QE--Tools/refs/heads/main/libs/bash/ci-operator/interop/common/ExitTrap--PostProcessPrep.sh)"
+              # 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).
+              trap '
+                  mkdir -p /tmp/bin
+                  printf "%s\n" "#!/bin/sh" "exit 1" > /tmp/bin/yq && chmod +x /tmp/bin/yq
+                  PATH="/tmp/bin:${PATH}"
+                  LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
+                      ExitTrap--PostProcessPrep junit--serverless-operator__operator-e2e.xml
+              ' EXIT
+              GOPATH=/tmp/go \
+                  PATH=$PATH:/tmp/go/bin \
+                  SKIP_MESH_AUTH_POLICY_GENERATION=true \
+                  SKIP_SPOT_INSTANCES=true \
+                  MAP_TESTS=true \
+                  make test-e2e-with-kafka
+            env:
+            - default: lp-ocp-compat--Serverless
+              name: DR__RP__CR_COMP_NAME
             from: serverless-source-image
+            grace_period: 10m0s
             resources:
               limits:
                 memory: 8Gi
@@ -421,9 +441,29 @@ repositories:
                 cpu: 100m
                 memory: 200Mi
           - as: knative-serving-eventing-e2e
-            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true
-              SKIP_SPOT_INSTANCES=true MAP_TESTS=true make test-upstream-e2e-no-upgrade
+            commands: |
+              set -euxo pipefail; shopt -s inherit_errexit
+              eval "$(curl -fsSL https://raw.githubusercontent.com/RedHatQE/OpenShift-LP-QE--Tools/refs/heads/main/libs/bash/ci-operator/interop/common/ExitTrap--PostProcessPrep.sh)"
+              # 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).
+              trap '
+                  mkdir -p /tmp/bin
+                  printf "%s\n" "#!/bin/sh" "exit 1" > /tmp/bin/yq && chmod +x /tmp/bin/yq
+                  PATH="/tmp/bin:${PATH}"
+                  LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
+                      ExitTrap--PostProcessPrep junit--serverless-operator__knative-serving-eventing-e2e.xml
+              ' EXIT
+              GOPATH=/tmp/go \
+                  PATH=$PATH:/tmp/go/bin \
+                  SKIP_MESH_AUTH_POLICY_GENERATION=true \
+                  SKIP_SPOT_INSTANCES=true \
+                  MAP_TESTS=true \
+                  make test-upstream-e2e-no-upgrade
+            env:
+            - default: lp-ocp-compat--Serverless
+              name: DR__RP__CR_COMP_NAME
             from: serverless-source-image
+            grace_period: 10m0s
             resources:
               limits:
                 memory: 8Gi
@@ -431,9 +471,29 @@ repositories:
                 cpu: 100m
                 memory: 200Mi
           - as: knative-eventing-kafka-broker-e2e
-            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true
-              SKIP_SPOT_INSTANCES=true MAP_TESTS=true make test-upstream-e2e-kafka-no-upgrade
+            commands: |
+              set -euxo pipefail; shopt -s inherit_errexit
+              eval "$(curl -fsSL https://raw.githubusercontent.com/RedHatQE/OpenShift-LP-QE--Tools/refs/heads/main/libs/bash/ci-operator/interop/common/ExitTrap--PostProcessPrep.sh)"
+              # 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).
+              trap '
+                  mkdir -p /tmp/bin
+                  printf "%s\n" "#!/bin/sh" "exit 1" > /tmp/bin/yq && chmod +x /tmp/bin/yq
+                  PATH="/tmp/bin:${PATH}"
+                  LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
+                      ExitTrap--PostProcessPrep junit--serverless-operator__knative-eventing-kafka-broker-e2e.xml
+              ' EXIT
+              GOPATH=/tmp/go \
+                  PATH=$PATH:/tmp/go/bin \
+                  SKIP_MESH_AUTH_POLICY_GENERATION=true \
+                  SKIP_SPOT_INSTANCES=true \
+                  MAP_TESTS=true \
+                  make test-upstream-e2e-kafka-no-upgrade
+            env:
+            - default: lp-ocp-compat--Serverless
+              name: DR__RP__CR_COMP_NAME
             from: serverless-source-image
+            grace_period: 10m0s
             resources:
               limits:
                 memory: 10Gi
@@ -441,13 +501,14 @@ repositories:
                 cpu: 100m
                 memory: 200Mi
           workflow: firewatch-ipi-aws-cr
-      - as: aws-fips
+      - as: operator-e2e--aws-fips
         cron: 0 23 31 2 *
         steps:
           cluster_profile: aws-cspi-qe
           env:
             BASE_DOMAIN: cspilp.interop.ccitredhat.com
             COMPUTE_NODE_REPLICAS: "6"
+            DR__RP__CR_COMP_NAME: lp-ocp-compat--Serverless
             FIPS_ENABLED: "true"
             FIREWATCH_CONFIG: |
               {
@@ -465,14 +526,33 @@ repositories:
             FIREWATCH_DEFAULT_JIRA_ASSIGNEE: maschmid@redhat.com
             FIREWATCH_DEFAULT_JIRA_PROJECT: SRVCOM
             OCP_VERSION: "4.22"
-            REPORTPORTAL_CMP: Serverless-lp-interop
             USER_TAGS: |
               scenario serverless
           test:
           - as: operator-e2e
-            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true
-              SKIP_SPOT_INSTANCES=true MAP_TESTS=true make test-e2e-with-kafka
+            commands: |
+              set -euxo pipefail; shopt -s inherit_errexit
+              eval "$(curl -fsSL https://raw.githubusercontent.com/RedHatQE/OpenShift-LP-QE--Tools/refs/heads/main/libs/bash/ci-operator/interop/common/ExitTrap--PostProcessPrep.sh)"
+              # 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).
+              trap '
+                  mkdir -p /tmp/bin
+                  printf "%s\n" "#!/bin/sh" "exit 1" > /tmp/bin/yq && chmod +x /tmp/bin/yq
+                  PATH="/tmp/bin:${PATH}"
+                  LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
+                      ExitTrap--PostProcessPrep junit--serverless-operator__operator-e2e.xml
+              ' EXIT
+              GOPATH=/tmp/go \
+                  PATH=$PATH:/tmp/go/bin \
+                  SKIP_MESH_AUTH_POLICY_GENERATION=true \
+                  SKIP_SPOT_INSTANCES=true \
+                  MAP_TESTS=true \
+                  make test-e2e-with-kafka
+            env:
+            - default: lp-ocp-compat--Serverless
+              name: DR__RP__CR_COMP_NAME
             from: serverless-source-image
+            grace_period: 10m0s
             resources:
               limits:
                 memory: 8Gi
@@ -480,9 +560,29 @@ repositories:
                 cpu: 100m
                 memory: 200Mi
           - as: knative-serving-eventing-e2e
-            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true
-              SKIP_SPOT_INSTANCES=true MAP_TESTS=true make test-upstream-e2e-no-upgrade
+            commands: |
+              set -euxo pipefail; shopt -s inherit_errexit
+              eval "$(curl -fsSL https://raw.githubusercontent.com/RedHatQE/OpenShift-LP-QE--Tools/refs/heads/main/libs/bash/ci-operator/interop/common/ExitTrap--PostProcessPrep.sh)"
+              # 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).
+              trap '
+                  mkdir -p /tmp/bin
+                  printf "%s\n" "#!/bin/sh" "exit 1" > /tmp/bin/yq && chmod +x /tmp/bin/yq
+                  PATH="/tmp/bin:${PATH}"
+                  LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
+                      ExitTrap--PostProcessPrep junit--serverless-operator__knative-serving-eventing-e2e.xml
+              ' EXIT
+              GOPATH=/tmp/go \
+                  PATH=$PATH:/tmp/go/bin \
+                  SKIP_MESH_AUTH_POLICY_GENERATION=true \
+                  SKIP_SPOT_INSTANCES=true \
+                  MAP_TESTS=true \
+                  make test-upstream-e2e-no-upgrade
+            env:
+            - default: lp-ocp-compat--Serverless
+              name: DR__RP__CR_COMP_NAME
             from: serverless-source-image
+            grace_period: 10m0s
             resources:
               limits:
                 memory: 8Gi
@@ -490,9 +590,29 @@ repositories:
                 cpu: 100m
                 memory: 200Mi
           - as: knative-eventing-kafka-broker-e2e
-            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true
-              SKIP_SPOT_INSTANCES=true MAP_TESTS=true make test-upstream-e2e-kafka-no-upgrade
+            commands: |
+              set -euxo pipefail; shopt -s inherit_errexit
+              eval "$(curl -fsSL https://raw.githubusercontent.com/RedHatQE/OpenShift-LP-QE--Tools/refs/heads/main/libs/bash/ci-operator/interop/common/ExitTrap--PostProcessPrep.sh)"
+              # 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).
+              trap '
+                  mkdir -p /tmp/bin
+                  printf "%s\n" "#!/bin/sh" "exit 1" > /tmp/bin/yq && chmod +x /tmp/bin/yq
+                  PATH="/tmp/bin:${PATH}"
+                  LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \
+                      ExitTrap--PostProcessPrep junit--serverless-operator__knative-eventing-kafka-broker-e2e.xml
+              ' EXIT
+              GOPATH=/tmp/go \
+                  PATH=$PATH:/tmp/go/bin \
+                  SKIP_MESH_AUTH_POLICY_GENERATION=true \
+                  SKIP_SPOT_INSTANCES=true \
+                  MAP_TESTS=true \
+                  make test-upstream-e2e-kafka-no-upgrade
+            env:
+            - default: lp-ocp-compat--Serverless
+              name: DR__RP__CR_COMP_NAME
             from: serverless-source-image
+            grace_period: 10m0s
             resources:
               limits:
                 memory: 10Gi