diff --git a/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.18.yaml b/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.18.yaml
index 3507594f8c979..c136e6f08629f 100644
--- a/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.18.yaml
+++ b/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.18.yaml
@@ -103,8 +103,10 @@ tests:
         NETWORK_TYPE=OVNKubernetes
       GINKGO_FOCUS_FILTER: "53844"
       SKIP_QE_APP_REGISTRY: "true"
+      TIMEOUT: + 6 hours
     test:
     - chain: openshift-e2e-test-netobserv-prepare-bm-cluster
+    - ref: wait
     - chain: openshift-e2e-test-netobserv-pf5
     workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn
 - as: netobserv-metal-ds-ipi-ovn-ipv4-f60-virt
@@ -122,8 +124,10 @@ tests:
       GINKGO_FOCUS_FILTER: with VMs
       SKIP_FRONTEND_TESTS: "true"
       SKIP_QE_APP_REGISTRY: "true"
+      TIMEOUT: + 6 hours
     test:
     - chain: openshift-e2e-test-netobserv-prepare-bm-cluster
+    - ref: wait
     - chain: openshift-e2e-test-netobserv-pf5
     workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn
 - as: netobserv-vsphere-ipi-amd-f28
diff --git a/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.20.yaml b/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.20.yaml
index 85b194a838782..5363d1161b90b 100644
--- a/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.20.yaml
+++ b/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.20.yaml
@@ -113,8 +113,10 @@ tests:
         NETWORK_TYPE=OVNKubernetes
       GINKGO_FOCUS_FILTER: "53844"
       SKIP_QE_APP_REGISTRY: "true"
+      TIMEOUT: + 6 hours
     test:
     - chain: openshift-e2e-test-netobserv-prepare-bm-cluster
+    - ref: wait
     - chain: openshift-e2e-test-netobserv-pf5
     workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn
 - as: netobserv-metal-ds-ipi-ovn-ipv4-f28-virt
@@ -142,8 +144,10 @@ tests:
       GINKGO_FOCUS_FILTER: with VMs|83022
       SKIP_FRONTEND_TESTS: "true"
       SKIP_QE_APP_REGISTRY: "true"
+      TIMEOUT: + 6 hours
     test:
     - chain: openshift-e2e-test-netobserv-prepare-bm-cluster
+    - ref: wait
     - chain: openshift-e2e-test-netobserv-pf5
     workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn
 - as: netobserv-vsphere-ipi-amd-f28
diff --git a/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.22.yaml b/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.22.yaml
index 13e2808f29a4a..21758d2c1c8c6 100644
--- a/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.22.yaml
+++ b/ci-operator/config/openshift/network-observability-operator/openshift-network-observability-operator-release-2.0__nightly-4.22.yaml
@@ -113,8 +113,10 @@ tests:
         NETWORK_TYPE=OVNKubernetes
       GINKGO_FOCUS_FILTER: "53844"
       SKIP_QE_APP_REGISTRY: "true"
+      TIMEOUT: + 6 hours
     test:
     - chain: openshift-e2e-test-netobserv-prepare-bm-cluster
+    - ref: wait
     - chain: openshift-e2e-test-netobserv
     workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn
 - as: netobserv-metal-ds-ipi-ovn-ipv4-f28-virt
@@ -142,8 +144,10 @@ tests:
       GINKGO_FOCUS_FILTER: with VMs|83022
       SKIP_FRONTEND_TESTS: "true"
       SKIP_QE_APP_REGISTRY: "true"
+      TIMEOUT: + 6 hours
     test:
     - chain: openshift-e2e-test-netobserv-prepare-bm-cluster
+    - ref: wait
     - chain: openshift-e2e-test-netobserv
     workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn
 - as: netobserv-vsphere-ipi-amd-f28