diff --git a/multi-node-aio-xenial-ansible/build.sh b/multi-node-aio-xenial-ansible/build.sh
index 37ebb65b..05c1bdca 100755
--- a/multi-node-aio-xenial-ansible/build.sh
+++ b/multi-node-aio-xenial-ansible/build.sh
@@ -22,7 +22,7 @@ source functions.rc
 
 # Provide defaults for unset variables
 # Set first two octets of network used for containers, storage, etc
-NETWORK_BASE=${NETWORK_BASE:-172.29}
+NETWORK_BASE=${NETWORK_BASE:-10.29}
 
 # Instruct the system do all of the require host setup
 SETUP_HOST=${SETUP_HOST:-true}
diff --git a/multi-node-aio-xenial-ansible/deploy-osa.sh b/multi-node-aio-xenial-ansible/deploy-osa.sh
index 0fd2a649..8ce7bc6b 100755
--- a/multi-node-aio-xenial-ansible/deploy-osa.sh
+++ b/multi-node-aio-xenial-ansible/deploy-osa.sh
@@ -23,7 +23,7 @@ source functions.rc
 
 # Provide defaults for unset variables
 # Set first two octets of network used for containers, storage, etc
-NETWORK_BASE=${NETWORK_BASE:-172.29}
+NETWORK_BASE=${NETWORK_BASE:-10.29}
 
 # Reset the ssh-agent service to remove potential key issues
 ssh_agent_reset
diff --git a/multi-node-aio-xenial-ansible/openstack-service-setup.sh b/multi-node-aio-xenial-ansible/openstack-service-setup.sh
index cdb70de7..ddecf854 100644
--- a/multi-node-aio-xenial-ansible/openstack-service-setup.sh
+++ b/multi-node-aio-xenial-ansible/openstack-service-setup.sh
@@ -8,7 +8,7 @@ source openrc
 
 # Provide defaults for unset variables
 # Set first two octets of network used for containers, storage, etc
-NETWORK_BASE=${NETWORK_BASE:-172.29}
+NETWORK_BASE=${NETWORK_BASE:-10.29}
 
 # Create base flavors for the new deployment
 for flavor in micro tiny mini small medium large xlarge heavy; do
diff --git a/multi-node-aio-xenial-ansible/setup-pxeboot.sh b/multi-node-aio-xenial-ansible/setup-pxeboot.sh
index 56a198da..b4f62e9c 100644
--- a/multi-node-aio-xenial-ansible/setup-pxeboot.sh
+++ b/multi-node-aio-xenial-ansible/setup-pxeboot.sh
@@ -20,6 +20,9 @@ source functions.rc
 # bring in variable definitions if there is a variables.sh file
 [[ -f variables.sh ]] && source variables.sh
 
+# set up ssh key in case setup-infra is not run
+SSHKEY=${SSHKEY:-$(cat /root/.ssh/id_rsa.pub)}
+
 # Use Ansible to install and configure a DHCP server, TFTP server and Apache
 # so we can PXEboot all the VMs
 ansible-playbook -v -i inventory create_pxeboot_server.yml --extra-vars \