diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index 768ef855b4baba043c93c86851baaffd28b29175..e6c84d8f959bac5ec41f0c84a86440c7d80f76ce 100644
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -223,9 +223,11 @@ def InitCluster(cluster_name, mac_prefix, def_bridge,
                                     master_candidate=True,
                                     )
 
-  cfg = InitConfig(constants.CONFIG_VERSION,
-                   cluster_config, master_node_config)
-  ssh.WriteKnownHostsFile(cfg, constants.SSH_KNOWN_HOSTS_FILE)
+  sscfg = InitConfig(constants.CONFIG_VERSION,
+                     cluster_config, master_node_config)
+  ssh.WriteKnownHostsFile(sscfg, constants.SSH_KNOWN_HOSTS_FILE)
+  cfg = config.ConfigWriter()
+  cfg.Update(cfg.GetClusterInfo())
 
   # start the master ip
   # TODO: Review rpc call from bootstrap