diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__amd64-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__amd64-nightly.yaml
index e3d82d660068b..32d79f59cc2f0 100644
--- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__amd64-nightly.yaml
+++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__amd64-nightly.yaml
@@ -5249,14 +5249,13 @@ tests:
     cluster_profile: equinix-ocp-metal-qe
     env:
       AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
-      ENABLE_ETCD_ENCRYPTION: "true"
-      ENABLE_KDUMP: "true"
       RESERVE_BOOTSTRAP: "false"
       RT_ENABLED: "true"
       architecture: amd64
       masters: "1"
       workers: "0"
     test:
+    - ref: wait
     - chain: openshift-e2e-test-qe
     workflow: baremetal-lab-sno
 - as: metal-sno-ipv4-etcd-encryption-rt-kernel-basecap-f7
diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__arm64-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__arm64-nightly.yaml
index e921b3d6ebb42..59cedb919b40e 100644
--- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__arm64-nightly.yaml
+++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__arm64-nightly.yaml
@@ -684,13 +684,12 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
-      ENABLE_DISK_ENCRYPTION: "true"
-      ENABLE_ETCD_ENCRYPTION: "true"
       RESERVE_BOOTSTRAP: "false"
       architecture: arm64
       masters: "1"
       workers: "0"
     test:
+    - ref: wait
     - chain: openshift-e2e-test-qe
     workflow: baremetal-lab-sno
 - as: metal-sno-ipv4-disk-etcd-encryption-rhcos10-tp-f7
@@ -712,6 +711,7 @@ tests:
       masters: "1"
       workers: "0"
     test:
+    - ref: wait
     - chain: openshift-e2e-test-qe
     workflow: baremetal-lab-sno
 - as: metal-ipi-ovn-vmedia-bmc-verify-ca-f28