diff --git a/multi-node-aio/deploy-osa.sh b/multi-node-aio/deploy-osa.sh
index aa562a95..6ae77c04 100755
--- a/multi-node-aio/deploy-osa.sh
+++ b/multi-node-aio/deploy-osa.sh
@@ -101,19 +101,12 @@ popd
 # Set the number of forks for the ansible client calls
 export ANSIBLE_FORKS=${ANSIBLE_FORKS:-15}
 
+pushd /opt/openstack-ansible
+  export DEPLOY_AIO=true
+  bash ./scripts/run-playbooks.sh
+popd
+
 pushd /opt/openstack-ansible/playbooks
-
-# Running the HAP play is done because it "may" be needed. Note: In Master its not.
-install_bits haproxy-install.yml
-
-# Setup everything else
-for root_include in $(awk -F'include:' '{print $2}' setup-everything.yml); do
-  for include in $(awk -F'include:' '{print $2}' "${root_include}"); do
-    echo "[Executing \"${include}\" playbook]"
-    install_bits "${include}"
-  done
-done
-
 # This is optional and only being done to give the cloud networks and an image.
 #  The tempest install will work out of the box because the deployment is setup
 #  already with all of the correct networks, devices, and other bits. If you want
diff --git a/multi-node-aio/deploy-vms.sh b/multi-node-aio/deploy-vms.sh
index c27d59ae..c023d029 100755
--- a/multi-node-aio/deploy-vms.sh
+++ b/multi-node-aio/deploy-vms.sh
@@ -48,7 +48,22 @@ rekick_vms
 # Wait here for all nodes to be booted and ready with SSH
 wait_ssh
 
-# Ensure that all running VMs have an updated apt-cache
-for node in $(get_all_hosts); do
-  ssh -q -n -f -o StrictHostKeyChecking=no 10.0.0.${node#*":"} "apt-get clean && apt-get update"
+# Export all system keys
+mkdir -p /tmp/keys
+for i in $(apt-key list | awk '/pub/ {print $2}' | awk -F'/' '{print $2}'); do
+  apt-key export "$i" > "/tmp/keys/$i"
 done
+
+# Ensure that all running VMs have an updated apt-cache with keys
+for node in $(get_all_hosts); do
+  ssh -q -n -f -o StrictHostKeyChecking=no 10.0.0.${node#*":"} "mkdir -p /tmp/keys"
+  for i in /tmp/all-apt-keys /etc/apt/apt.conf.d/00-nokey /etc/apt/sources.list /etc/apt/sources.list.d/* /tmp/keys/*; do
+    scp "$i" "10.0.0.${node#*":"}:$i"
+  done
+  ssh -q -n -f -o StrictHostKeyChecking=no 10.0.0.${node#*":"} "(for i in /tmp/keys/*; do \
+      apt-key add \$i; \
+      apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \$(basename \$i); done); \
+    apt-get clean; \
+    apt-get update"
+done
+
diff --git a/multi-node-aio/setup-cobbler.sh b/multi-node-aio/setup-cobbler.sh
index c9588ce4..2981b125 100755
--- a/multi-node-aio/setup-cobbler.sh
+++ b/multi-node-aio/setup-cobbler.sh
@@ -20,7 +20,7 @@ source functions.rc
 # Install cobbler
 wget -qO - http://download.opensuse.org/repositories/home:/libertas-ict:/cobbler26/xUbuntu_14.04/Release.key | apt-key add -
 add-apt-repository "deb http://download.opensuse.org/repositories/home:/libertas-ict:/cobbler26/xUbuntu_14.04/ ./"
-apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install cobbler dhcp3-server debmirror isc-dhcp-server ipcalc tftpd tftp fence-agents iptables-persistent
+apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install cobbler dhcp3-server debmirror isc-dhcp-server ipcalc tftpd tftp fence-agents iptables-persistent
 
 # Basic cobbler setup
 sed -i 's/^manage_dhcp\:.*/manage_dhcp\: 1/g' /etc/cobbler/settings
diff --git a/multi-node-aio/setup-host.sh b/multi-node-aio/setup-host.sh
index ac6cd0f7..270b9bf9 100755
--- a/multi-node-aio/setup-host.sh
+++ b/multi-node-aio/setup-host.sh
@@ -81,7 +81,7 @@ iptables_filter_rule_add mangle 'POSTROUTING -s 10.0.0.0/24 -o br-dhcp -p udp -m
 iptables_filter_rule_add mangle 'POSTROUTING -p tcp -j CHECKSUM --checksum-fill'
 
 # Enable partitioning of the "${DATA_DISK_DEVICE}"
-PARTITION_HOST=${PARTITION_HOST:-true}
+PARTITION_HOST=${PARTITION_HOST:-false}
 if [[ "${PARTITION_HOST}" = true ]]; then
   # Set the data disk device, if unset the largest unpartitioned device will be used to for host VMs
   DATA_DISK_DEVICE="${DATA_DISK_DEVICE:-$(lsblk -brndo NAME,TYPE,FSTYPE,RO,SIZE | awk '/d[b-z]+ disk +0/{ if ($4>m){m=$4; d=$1}}; END{print d}')}"
@@ -93,3 +93,22 @@ if [[ "${PARTITION_HOST}" = true ]]; then
   fi
   mount -a
 fi
+
+cat > /etc/sources.list <<EOF
+# Faster likely unsigned repo
+deb [arch=amd64] http://mirror.rackspace.com/ubuntu trusty main universe
+deb [arch=amd64] http://mirror.rackspace.com/ubuntu trusty-updates main universe
+deb [arch=amd64] http://mirror.rackspace.com/ubuntu trusty-backports main universe
+deb [arch=amd64] http://mirror.rackspace.com/ubuntu trusty-security main universe
+
+# i386 comes from the global known repo. This is slower and so it is only used for i386 packages
+deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty main universe
+deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty-updates main universe
+deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty-backports main universe
+deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty-security main universe
+EOF
+
+# Allow apt repos to be UnAuthenticated
+cat > /etc/apt/apt.conf.d/00-nokey <<EOF
+APT { Get { AllowUnauthenticated "1"; }; };
+EOF