diff --git a/config-drive/master_config.sh b/config-drive/master_config.sh
index 258ff71..edbce84 100644
--- a/config-drive/master_config.sh
+++ b/config-drive/master_config.sh
@@ -57,7 +57,15 @@
     maas ${PROFILE} boot-source delete 1
     maas ${PROFILE} boot-resources import
     # TODO wait for finish,and stop import.
+  else
+    maas ${PROFILE} boot-source-selections create 1 os="ubuntu" release="xenial" arches="amd64" subarches="*" labels="*"
+    maas ${PROFILE} boot-resources import
   fi
+  while [ ! -d /var/lib/maas/boot-resources/current/ubuntu/amd64/generic/xenial ]
+  do
+    sleep 10
+    echo "WARNING: Image is still not ready"
+  done
 }
 
 ### Body
@@ -135,6 +143,7 @@
 salt-call state.sls reclass,ntp
 
 _post_maas_cfg
+salt-call state.sls maas.cluster,maas.region || salt-call state.sls maas.cluster,maas.region
 
 ssh-keyscan cfg01 > /var/lib/jenkins/.ssh/known_hosts || true