diff --git a/config-drive/master_config.sh b/config-drive/master_config.sh
index 81a8714..e472cc0 100644
--- a/config-drive/master_config.sh
+++ b/config-drive/master_config.sh
@@ -89,7 +89,8 @@
     echo 'WARNING: maas.cluster skipped!'
   fi
   if [[ "$_region" == 'true' ]]; then
-    salt-call ${SALT_OPTS} state.sls maas.region
+    # FIXME MAAS still can fail in rare race condition.
+    salt-call ${SALT_OPTS} state.sls maas.region || salt-call ${SALT_OPTS} state.sls maas.region
   else
     echo 'WARNING: maas.region skipped!'
   fi
diff --git a/config-drive/mirror_config.sh b/config-drive/mirror_config.sh
index 6c13993..9b5d2f1 100644
--- a/config-drive/mirror_config.sh
+++ b/config-drive/mirror_config.sh
@@ -56,7 +56,7 @@
 ifup ens3
 
 echo "Configuring salt"
-rm /etc/salt/pki/minion/minion_master.pub
+rm -f /etc/salt/pki/minion/minion_master.pub
 envsubst < /root/minion.conf > /etc/salt/minion.d/minion.conf
 service salt-minion restart