diff --git a/salt/_pillar/metalk8s_nodes.py b/salt/_pillar/metalk8s_nodes.py
index 48d89330c7..c33d1ff43e 100644
--- a/salt/_pillar/metalk8s_nodes.py
+++ b/salt/_pillar/metalk8s_nodes.py
@@ -53,7 +53,7 @@ def node_info(node, ca_minion, pillar):
     # The `is_bootstrap` flag is set in pillar only when run the
     # `metalk8s.orchestrate.bootstrap` state.
     if pillar.get("is_bootstrap", False):
-        log.debug(
+        log.info(
             "Workaround: Adding bootstrap roles to pillar for node %s",
             node["metadata"]["name"],
         )
diff --git a/salt/metalk8s/orchestrate/bootstrap/init.sls b/salt/metalk8s/orchestrate/bootstrap/init.sls
index 3f9a7f2a73..a6b42b7261 100644
--- a/salt/metalk8s/orchestrate/bootstrap/init.sls
+++ b/salt/metalk8s/orchestrate/bootstrap/init.sls
@@ -68,6 +68,8 @@ Get metalk8s:control_plane_ip grain:
     }
 %}
 
+{%- for i in range(2) %}
+
 Sync all custom types:
   salt.runner:
   - name: saltutil.sync_all
@@ -109,6 +111,8 @@ Bring bootstrap minion to highstate:
     - salt: Sync bootstrap minion
     - salt: Deploy CA role on bootstrap minion
 
+  {%- if i > 0 %}
+
 Wait for API server to be available:
   http.wait_for_successful_query:
   - name: https://127.0.0.1:7443/healthz
@@ -199,3 +203,6 @@ Reconfigure control plane Ingress:
   - saltenv: {{ saltenv }}
   - require:
     - salt: Deploy Kubernetes objects
+
+    {%- endif %}
+{%- endfor %}
\ No newline at end of file