diff --git a/multi-node-aio/build.sh b/multi-node-aio/build.sh
index f065983d..afe4eece 100755
--- a/multi-node-aio/build.sh
+++ b/multi-node-aio/build.sh
@@ -19,7 +19,7 @@ source bootstrap.sh
 
 source ansible-env.rc
 
-ansible mnaio_hosts \
+ansible vm_hosts \
         -i ${MNAIO_INVENTORY:-"playbooks/inventory"} \
         -m pip \
         -a "name=netaddr"
diff --git a/multi-node-aio/playbooks/deploy-vms.yml b/multi-node-aio/playbooks/deploy-vms.yml
index bcc882cd..8d5499bc 100644
--- a/multi-node-aio/playbooks/deploy-vms.yml
+++ b/multi-node-aio/playbooks/deploy-vms.yml
@@ -226,6 +226,7 @@
         - "{{ playbook_dir }}/vars/{{ ansible_os_family | lower }}.yml"
       tags:
         - always
+
     - name: Start the VM
       virt:
         name: "{{ hostvars[item]['server_hostname'] }}"
diff --git a/multi-node-aio/playbooks/group_vars/mnaio_hosts.yml b/multi-node-aio/playbooks/group_vars/vm_hosts.yml
similarity index 100%
rename from multi-node-aio/playbooks/group_vars/mnaio_hosts.yml
rename to multi-node-aio/playbooks/group_vars/vm_hosts.yml
diff --git a/multi-node-aio/playbooks/inventory/hosts b/multi-node-aio/playbooks/inventory/hosts
index fa3538d5..a859890e 100644
--- a/multi-node-aio/playbooks/inventory/hosts
+++ b/multi-node-aio/playbooks/inventory/hosts
@@ -27,13 +27,6 @@ swift3         ansible_host=10.0.236.142
 [vm_hosts]
 mnaio1
 
-################################## PXE HOSTS ##################################
-
-# The group "mnaio_hosts" is used to define all host machines that will serve
-#  the purpose of running an MNAIO test environment.
-[mnaio_hosts]
-mnaio1
-
 # The group "pxe_hosts" is used to setup all systems that will be responsible
 #  for PXE boot. This will install all of the needed capabilities to TFTP serve
 #  system images.
diff --git a/multi-node-aio/playbooks/setup-host.yml b/multi-node-aio/playbooks/setup-host.yml
index f9f7a1e7..213aa204 100644
--- a/multi-node-aio/playbooks/setup-host.yml
+++ b/multi-node-aio/playbooks/setup-host.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 - name: Gather facts
-  hosts: mnaio_hosts
+  hosts: vm_hosts
   gather_facts: "{{ gather_facts | default(true) }}"
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags: