diff --git a/undercloud-bm.yaml b/undercloud-bm.yaml
index 181a58e..5a02427 100644
--- a/undercloud-bm.yaml
+++ b/undercloud-bm.yaml
@@ -152,6 +152,7 @@ Resources:
           ram_allocation_ratio: 1.0
           reserved_host_memory_mb: 0
         baremetal:
+          use_file_injection: True
           arch:
             Ref: BaremetalArch
           db: mysql://nova:unset@localhost/nova_bm
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index 4e09e77..98f253b 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -157,6 +157,7 @@ Resources:
           ram_allocation_ratio: 1.0
           reserved_host_memory_mb: 0
         baremetal:
+          use_file_injection: True
           arch:
             Ref: BaremetalArch
           db: mysql://nova:unset@localhost/nova_bm
diff --git a/elements/nova/os-apply-config/etc/nova/nova.conf b/elements/nova/os-apply-config/etc/nova/nova.conf
index 9663429..18632b1 100644
--- a/elements/nova/os-apply-config/etc/nova/nova.conf
+++ b/elements/nova/os-apply-config/etc/nova/nova.conf
@@ -114,6 +114,8 @@ driver = nova.virt.baremetal.pxe.PXE
 pxe_network_config=True
 pxe_deploy_timeout={{pxe_deploy_timeout}}
 power_manager = {{power_manager}}
+{{#use_file_injection}}use_file_injection={{use_file_injection}}{{/use_file_injection}}
+
 {{#virtual_power}}
 virtual_power_host_user={{user}}
 virtual_power_host_key={{key}}
diff --git a/scripts/devtest.sh b/scripts/devtest.sh
index 5f96e3f..81ad168 100755
--- a/scripts/devtest.sh
+++ b/scripts/devtest.sh
@@ -190,7 +197,7 @@ export NODE_DIST=${NODE_DIST:-ubuntu} #nodocs
 ##    neutron-dhcp-agent.
 ##    ::
 
-export DHCP_DRIVER=bm-dnsmasq
+export DHCP_DRIVER=neutron-dhcp-agent
 
 ## #. Ensure dependencies are installed and required virsh configuration is
 ##    performed:
diff --git a/scripts/devtest_undercloud.sh b/scripts/devtest_undercloud.sh
index 31102c4..e2555d2 100755
--- a/scripts/devtest_undercloud.sh
+++ b/scripts/devtest_undercloud.sh
@@ -96,8 +96,23 @@ setup-neutron 192.0.2.5 192.0.2.24 192.0.2.0/24 192.0.2.1 $UNDERCLOUD_IP ctlplan
 if [ "$DHCP_DRIVER" != "bm-dnsmasq" ]; then
     # See bug 1231366 - this may become part of setup-neutron if that is
     # determined to be not a bug.
     UNDERCLOUD_DHCP_AGENT_UUID=$(neutron agent-list | awk '/DHCP/ { print $2 }')
+    sleep 100
+    UNDERCLOUD_DHCP_AGENT_UUID=$(neutron agent-list | awk '/DHCP/ { print $2 }')
     neutron dhcp-agent-network-add $UNDERCLOUD_DHCP_AGENT_UUID ctlplane
 fi
 
 ## #. Create two more 'baremetal' node(s) and register them with your undercloud.