diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index 729b96b..7b075ee 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -37,6 +37,10 @@
   - copy-cord
   - copy-config
 
+# Wait until headnode prepped before building containers, for consistent DNS
+docker_images_prereqs:
+  - prep-headnode
+
 # Start elasticstack before XOS/ONOS, which log to it
 start_xos_prereqs:
   - deploy-elasticstack
diff --git a/scenarios/mock/config.yml b/scenarios/mock/config.yml
index 2b90aa5..9885554 100644
--- a/scenarios/mock/config.yml
+++ b/scenarios/mock/config.yml
@@ -32,11 +32,15 @@
 prep_headnode_prereqs:
   - prep-buildnode
 
+docker_images_prereqs:
+  - prep-headnode
+
 # mock profile configuration
 frontend_only: True
 use_maas: False
 use_apt_cache: False
 use_openstack: False
+create_configdirs_become: False
 xos_images: []
 
 # whitelist of images for imagebuilder to build/pull (tagged elsewhere)
diff --git a/scenarios/opencloud/config.yml b/scenarios/opencloud/config.yml
index f705289..e9a6a79 100644
--- a/scenarios/opencloud/config.yml
+++ b/scenarios/opencloud/config.yml
@@ -16,6 +16,7 @@
 
 # Make build config
 build_targets:
+ - onos-debug
  - onboard-openstack
 
 vagrant_up_prereqs:
@@ -36,6 +37,10 @@
 prep_headnode_prereqs:
   - prep-buildnode
 
+# Wait until headnode prepped before building containers, for consistent DNS
+docker_images_prereqs:
+  - prep-headnode
+
 # Start elasticstack before XOS/ONOS, which log to it
 start_xos_prereqs:
   - deploy-elasticstack
@@ -50,14 +55,15 @@
     aliases:
       - head
   - name: compute1
-    ipv4_last_octet: 20
+    ipv4_last_octet: 250
   - name: compute2
-    ipv4_last_octet: 21
+    ipv4_last_octet: 251
 
 # Vagrant VM configuration
 vagrant_vms:
   - head1
   - compute1
+  - compute2
 
 head_vm_mem: 16384
 head_vm_cpu: 8
@@ -114,4 +120,5 @@
 
   compute:
     compute1:
+    compute2:
 
diff --git a/scenarios/single/config.yml b/scenarios/single/config.yml
index 4ceb2cb..11ed821 100644
--- a/scenarios/single/config.yml
+++ b/scenarios/single/config.yml
@@ -32,11 +32,15 @@
 prep_headnode_prereqs:
   - prep-buildnode
 
+docker_images_prereqs:
+  - prep-headnode
+
 # single scenario configuration
 frontend_only: False
 use_maas: False
 use_apt_cache: False
 use_openstack: False
+create_configdirs_become: False
 xos_images: []
 
 # whitelist of images for imagebuilder to build/pull (tagged elsewhere)