diff --git a/multi-node-aio/playbooks/deploy-vms.yml b/multi-node-aio/playbooks/deploy-vms.yml
index 81459388..65428c2d 100644
--- a/multi-node-aio/playbooks/deploy-vms.yml
+++ b/multi-node-aio/playbooks/deploy-vms.yml
@@ -224,23 +224,6 @@
   import_playbook: vm-status.yml
 
 
-- name: Create vm_servers group
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - deploy-vms
-  tasks:
-    - name: VM Servers group
-      add_host:
-        name: "{{ item }}"
-        groups: vm_servers
-      when:
-        - hostvars[item]['server_vm'] | default(false) | bool
-      with_items: "{{ groups['pxe_servers'] }}"
-
-
 - name: VM Host Setup
   hosts: vm_servers
   gather_facts: false
diff --git a/multi-node-aio/playbooks/vm-status.yml b/multi-node-aio/playbooks/vm-status.yml
index 7154c4ef..2b33a541 100644
--- a/multi-node-aio/playbooks/vm-status.yml
+++ b/multi-node-aio/playbooks/vm-status.yml
@@ -15,6 +15,7 @@
 
 - name: Create vm_servers group
   hosts: localhost
+  connection: local
   gather_facts: false
   tasks:
     - name: VM Servers group
@@ -22,7 +23,7 @@
         name: "{{ item }}"
         groups: vm_servers
       when:
-        - hostvars[item]['server_vm'] | default(false) | bool
+        - (hostvars[item]['server_vm'] | default(false)) | bool
       with_items: "{{ groups['pxe_servers'] }}"
 
 - name: VM Status