diff --git a/roles/compute-prep/tasks/main.yml b/roles/compute-prep/tasks/main.yml
index 0c57979..1ddee39 100644
--- a/roles/compute-prep/tasks/main.yml
+++ b/roles/compute-prep/tasks/main.yml
@@ -32,7 +32,7 @@
     mode=0755
   notify:
     - run rc.local
-  when: not cord_provisioned
+  when: not on_maas
 
 - name: Create /var/lib/nova dir
   file:
diff --git a/roles/config-virt/tasks/main.yml b/roles/config-virt/tasks/main.yml
index f3dc91d..67a14a1 100644
--- a/roles/config-virt/tasks/main.yml
+++ b/roles/config-virt/tasks/main.yml
@@ -13,7 +13,7 @@
     command=facts
 
 - name: Tear down libvirt's default network
-  when: not cord_provisioned and ansible_libvirt_networks["default"] is defined
+  when: not on_maas and ansible_libvirt_networks["default"] is defined
   virt_net:
     command={{ item }}
     name=default
@@ -28,22 +28,22 @@
     command=define
     xml='{{ lookup("template", "virt_net.xml.j2") }}'
   with_items: '{{ virt_nets }}'
-  when: not cord_provisioned
+  when: not on_maas
 
 - name: collect libvirt network facts after defining new network
   virt_net:
     command=facts
-  when: not cord_provisioned
+  when: not on_maas
 
 - name: start libvirt networks
-  when: not cord_provisioned and ansible_libvirt_networks["xos-{{ item.name }}"].state != "active"
+  when: not on_maas and ansible_libvirt_networks["xos-{{ item.name }}"].state != "active"
   virt_net:
     name=xos-{{ item.name }}
     command=create
   with_items: '{{ virt_nets }}'
 
 - name: have libvirt networks autostart
-  when: not cord_provisioned and ansible_libvirt_networks["xos-{{ item.name }}"].autostart != "yes"
+  when: not on_maas and ansible_libvirt_networks["xos-{{ item.name }}"].autostart != "yes"
   virt_net:
     name=xos-{{ item.name }}
     autostart=yes
@@ -61,7 +61,7 @@
   notify:
     - reload libvirt-bin
     - run qemu hook
-  when: not cord_provisioned
+  when: not on_maas
 
 - name: Wait for uvt-kvm image to be available
   async_status: jid={{ uvt_sync.ansible_job_id }}
diff --git a/roles/create-vms/tasks/main.yml b/roles/create-vms/tasks/main.yml
index b20c82e..48cbb3a 100644
--- a/roles/create-vms/tasks/main.yml
+++ b/roles/create-vms/tasks/main.yml
@@ -42,19 +42,19 @@
   template:
     src=eth0.cfg.j2
     dest={{ ansible_user_dir }}/eth0.cfg
-  when: not cord_provisioned
+  when: not on_maas
 
 - name: Copy eth0 interface config file to all VMs
   command: ansible services -b -u ubuntu -m copy -a "src={{ ansible_user_dir }}/eth0.cfg dest=/etc/network/interfaces.d/eth0.cfg owner=root group=root mode=0644"
-  when: not cord_provisioned
+  when: not on_maas
 
 - name: Restart eth0 interface on all VMs
   command: ansible services -b -u ubuntu -m shell -a "ifdown eth0 ; ifup eth0"
-  when: not cord_provisioned
+  when: not on_maas
 
 - name: Verify that we can log into every VM after restarting network interfaces
   command: ansible services -m ping -u ubuntu
-  when: not cord_provisioned
+  when: not on_maas
 
 # sshkey is registered in head-prep task
 - name: Enable root ssh login on VM's that require it