diff --git a/ci-operator/step-registry/hypershift/mce/ibmz/create/hcp/hypershift-mce-ibmz-create-hcp-commands.sh b/ci-operator/step-registry/hypershift/mce/ibmz/create/hcp/hypershift-mce-ibmz-create-hcp-commands.sh
index 7ba998be08fb..4f2e7694ba46 100644
--- a/ci-operator/step-registry/hypershift/mce/ibmz/create/hcp/hypershift-mce-ibmz-create-hcp-commands.sh
+++ b/ci-operator/step-registry/hypershift/mce/ibmz/create/hcp/hypershift-mce-ibmz-create-hcp-commands.sh
@@ -215,4 +215,4 @@ echo "$(date) ISO Download url is ready"
 
 # Download hosted cluster kubeconfig
 echo "$(date) Create hosted cluster kubeconfig"
-${HYPERSHIFT_CLI_NAME} create kubeconfig --namespace=${HC_NS} --name=${HC_NAME} >${SHARED_DIR}/${HC_NAME}_kubeconfig
+${HYPERSHIFT_CLI_NAME} create kubeconfig --namespace=${HC_NS} --name=${HC_NAME} >${SHARED_DIR}/nested_kubeconfig
diff --git a/ci-operator/step-registry/hypershift/mce/ibmz/create/zvsicompute/hypershift-mce-ibmz-create-zvsicompute-commands.sh b/ci-operator/step-registry/hypershift/mce/ibmz/create/zvsicompute/hypershift-mce-ibmz-create-zvsicompute-commands.sh
index dc504900e208..3648469cc609 100644
--- a/ci-operator/step-registry/hypershift/mce/ibmz/create/zvsicompute/hypershift-mce-ibmz-create-zvsicompute-commands.sh
+++ b/ci-operator/step-registry/hypershift/mce/ibmz/create/zvsicompute/hypershift-mce-ibmz-create-zvsicompute-commands.sh
@@ -173,7 +173,7 @@ else
 fi
 
 echo "Fetching the hosted cluster IP address for resolution"
-hc_url=$(cat ${SHARED_DIR}/${HC_NAME}_kubeconfig | awk '/server/{print $2}' | cut -c 9- | cut -d ':' -f 1)
+hc_url=$(cat ${SHARED_DIR}/nested_kubeconfig | awk '/server/{print $2}' | cut -c 9- | cut -d ':' -f 1)
 hc_ip=$(dig +short $hc_url | head -1)
 
 echo "Adding A records in the DNS zone $HC_NAME.$HYPERSHIFT_BASEDOMAIN to resolve the api URLs of hosted cluster to the hosted cluster IP."
@@ -285,5 +285,6 @@ echo "$(date) All the agents are attached as compute nodes to the hosted control
 
 # Verifying the compute nodes status
 echo "$(date) Checking the compute nodes in the hosted control plane"
-oc get no --kubeconfig="${SHARED_DIR}/${HC_NAME}_kubeconfig"
-echo "$(date) Successfully completed the e2e creation chain"
\ No newline at end of file
+oc get no --kubeconfig="${SHARED_DIR}/nested_kubeconfig"
+oc --kubeconfig="${SHARED_DIR}/nested_kubeconfig" wait --all=true co --for=condition=Available=True --timeout=30m
+echo "$(date) Successfully completed the e2e creation chain"
diff --git a/ci-operator/step-registry/hypershift/mce/ibmz/test/hypershift-mce-ibmz-test-chain.yaml b/ci-operator/step-registry/hypershift/mce/ibmz/test/hypershift-mce-ibmz-test-chain.yaml
index 9551041ffc70..4a493fd2d410 100644
--- a/ci-operator/step-registry/hypershift/mce/ibmz/test/hypershift-mce-ibmz-test-chain.yaml
+++ b/ci-operator/step-registry/hypershift/mce/ibmz/test/hypershift-mce-ibmz-test-chain.yaml
@@ -9,7 +9,7 @@ chain:
       commands: |-
         set -x
         echo "$(date) Checking for the cluster-operators status to be ready"
-        export KUBECONFIG=${SHARED_DIR}/${HC_NAME}_kubeconfig
+        export KUBECONFIG=${SHARED_DIR}/nested_kubeconfig
         while true; do
             count=$(oc get co --no-headers| awk '$3 != "True" {print $1}' | wc -l)
             if [ "$count" -eq 0 ]