diff --git a/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh b/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh
index b575962c2df4..318aedba344c 100644
--- a/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh
+++ b/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh
@@ -45,6 +45,7 @@ fi
   --api-server-address=api.${CLUSTER_NAME}.${BASEDOMAIN} \
   --image-content-sources "${SHARED_DIR}/mgmt_icsp.yaml" \
   --ssh-key="${SHARED_DIR}/id_rsa.pub" \
+  --network-type=OVNKubernetes \
   --release-image ${RELEASE_IMAGE}
 
 if (( $(awk 'BEGIN {print ("'"$MCE_VERSION"'" < 2.4)}') )); then
diff --git a/ci-operator/step-registry/hypershift/mce/agent/destroy/hypershift-mce-agent-destroy-chain.yaml b/ci-operator/step-registry/hypershift/mce/agent/destroy/hypershift-mce-agent-destroy-chain.yaml
index 9e48cc587d8d..3c715d10e4d6 100644
--- a/ci-operator/step-registry/hypershift/mce/agent/destroy/hypershift-mce-agent-destroy-chain.yaml
+++ b/ci-operator/step-registry/hypershift/mce/agent/destroy/hypershift-mce-agent-destroy-chain.yaml
@@ -26,6 +26,11 @@ chain:
         fi
 
         CLUSTER_NAME="$(echo -n $PROW_JOB_ID|sha256sum|cut -c-20)"
+
+        oc get machine -n "local-cluster-$CLUSTER_NAME" -o=jsonpath='{.items[*].metadata.name}' | \
+        while read -r machine_name; do
+          oc patch machine "$machine_name" -n "local-cluster-$CLUSTER_NAME" -p '{"metadata":{"finalizers":[]}}' --type=merge
+        done
         
         echo "$(date) Deleting HyperShift cluster ${CLUSTER_NAME}"
         /tmp/${HYPERSHIFT_NAME} destroy cluster agent \
diff --git a/ci-operator/step-registry/hypershift/mce/agent/disconnected/create/hostedcluster/hypershift-mce-agent-disconnected-create-hostedcluster-commands.sh b/ci-operator/step-registry/hypershift/mce/agent/disconnected/create/hostedcluster/hypershift-mce-agent-disconnected-create-hostedcluster-commands.sh
index 76e212efa8be..4686179dd993 100644
--- a/ci-operator/step-registry/hypershift/mce/agent/disconnected/create/hostedcluster/hypershift-mce-agent-disconnected-create-hostedcluster-commands.sh
+++ b/ci-operator/step-registry/hypershift/mce/agent/disconnected/create/hostedcluster/hypershift-mce-agent-disconnected-create-hostedcluster-commands.sh
@@ -66,6 +66,7 @@ fi
   --base-domain=\${BASEDOMAIN} \
   --api-server-address=api.\${CLUSTER_NAME}.\${BASEDOMAIN} \
   --image-content-sources "/home/mgmt_icsp.yaml" \
+  --network-type=OVNKubernetes \
   --release-image \${PLAYLOADIMAGE}
 
 echo "Waiting for cluster to become available"
diff --git a/ci-operator/step-registry/hypershift/mce/agent/metal3/conformance/hypershift-mce-agent-metal3-conformance-workflow.yaml b/ci-operator/step-registry/hypershift/mce/agent/metal3/conformance/hypershift-mce-agent-metal3-conformance-workflow.yaml
index dedf3105a848..626a8f9635fe 100644
--- a/ci-operator/step-registry/hypershift/mce/agent/metal3/conformance/hypershift-mce-agent-metal3-conformance-workflow.yaml
+++ b/ci-operator/step-registry/hypershift/mce/agent/metal3/conformance/hypershift-mce-agent-metal3-conformance-workflow.yaml
@@ -8,6 +8,7 @@ workflow:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
     post:
+    - ref: wait
     - chain: hypershift-mce-agent-destroy
     - chain: baremetalds-ofcir-post
     test: