diff --git a/tools/deployment/26_deploy_metal3_capi_ephemeral_node.sh b/tools/deployment/26_deploy_metal3_capi_ephemeral_node.sh
index 5fbfb0791..fe8b7b429 100755
--- a/tools/deployment/26_deploy_metal3_capi_ephemeral_node.sh
+++ b/tools/deployment/26_deploy_metal3_capi_ephemeral_node.sh
@@ -23,8 +23,9 @@ airshipctl phase run initinfra-networking-ephemeral --debug
 echo "Wait for Calico to be deployed using tigera"
 kubectl --kubeconfig $KUBECONFIG --context $KUBECONFIG_EPHEMERAL_CONTEXT wait --all-namespaces --for=condition=Ready pods --all --timeout=1000s
 
-echo "Wait for Tigerastatus to be Available"
-kubectl --kubeconfig $KUBECONFIG --context $KUBECONFIG_EPHEMERAL_CONTEXT wait --for=condition=Available tigerastatus --all --timeout=1000s -A
+# Skipping this check due a race condition till a work-around is identified.
+#echo "Wait for Tigerastatus to be Available"
+#kubectl --kubeconfig $KUBECONFIG --context $KUBECONFIG_EPHEMERAL_CONTEXT wait --for=condition=Available tigerastatus --all --timeout=1000s -A
 
 echo "Deploy metal3.io components to ephemeral node"
 airshipctl phase run initinfra-ephemeral --debug
diff --git a/tools/deployment/31_deploy_initinfra_target_node.sh b/tools/deployment/31_deploy_initinfra_target_node.sh
index 7653cea0e..fe8786a73 100755
--- a/tools/deployment/31_deploy_initinfra_target_node.sh
+++ b/tools/deployment/31_deploy_initinfra_target_node.sh
@@ -24,8 +24,9 @@ airshipctl phase run initinfra-networking-target --debug
 echo "Wait for Calico to be deployed using tigera"
 kubectl --kubeconfig $KUBECONFIG --context $KUBECONFIG_TARGET_CONTEXT wait --all-namespaces --for=condition=Ready pods --all --timeout=600s
 
-echo "Wait for Tigerastatus to be available"
-kubectl --kubeconfig $KUBECONFIG --context $KUBECONFIG_TARGET_CONTEXT wait --for=condition=Available tigerastatus --all --timeout=600s -A
+# Skipping this check due a race condition till a work-around is identified.
+#echo "Wait for Tigerastatus to be available"
+#kubectl --kubeconfig $KUBECONFIG --context $KUBECONFIG_TARGET_CONTEXT wait --for=condition=Available tigerastatus --all --timeout=600s -A
 
 echo "Deploy infra to cluster"
 airshipctl phase run initinfra-target --debug