diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10-presubmits.yaml
index 13e10ce2a6624..f0ebac5b244c5 100644
--- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10-presubmits.yaml
@@ -7,6 +7,8 @@ presubmits:
     cluster: api.ci
     context: ci/prow/gcp-major-upgrade
     decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-openshift-ansible-310-gcp-major-upgrade
     rerun_command: /test gcp-major-upgrade
     spec:
diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11-presubmits.yaml
index 252f63ecd2895..acf7d98d59a6d 100644
--- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11-presubmits.yaml
@@ -7,6 +7,8 @@ presubmits:
     cluster: api.ci
     context: ci/prow/gcp-major-upgrade
     decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-openshift-ansible-3.11-gcp-major-upgrade
     optional: true
     rerun_command: /test gcp-major-upgrade
diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-upgrade.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-upgrade.yaml
index 45d4461d2a187..9aad44189b072 100644
--- a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-upgrade.yaml
+++ b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-upgrade.yaml
@@ -142,7 +142,11 @@ objects:
 
         function run-tests() {
           if which openshift-tests && [[ -n "${TEST_SUITE-}" ]]; then
+            openshift-tests run-resourcewatch &
+            rw_pid=$!
             openshift-tests run "${TEST_SUITE}" --provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
+            kill $rw_pid
+            tar -cf ${ARTIFACT_DIR}/rw.tar /repository
             return 0
           fi
           # TODO: remove everything after this point once we fork templates by release - starting with 4.0