diff --git a/cord-compute-maas-playbook.yml b/cord-compute-maas-playbook.yml
index 043d316..4da725f 100644
--- a/cord-compute-maas-playbook.yml
+++ b/cord-compute-maas-playbook.yml
@@ -11,34 +11,11 @@
         - "profile_manifests/{{ cord_profile }}.yml"
         - profile_manifests/local_vars.yml
 
-- name: Configure compute hosts to use DNS server
-  hosts: all
-  become: yes
-  roles:
-    - { role: dns-configure, when: not on_maas }
+- include: prep-computenode-playbook.yml
+- include: deploy-computenode-playbook.yml
 
-- name: Prep systems
-  hosts: compute
-  become: yes
-  roles:
-    - common-prep
-    - { role: cloudlab-prep, when: on_cloudlab }
-
-- name: Configure head node (for sshkey)
+- name:  Enable Compute Node (MaaS)
   hosts: head
   roles:
-    - { role: head-prep, become: yes }
-
-- name: Configure compute nodes
-  hosts: compute
-  become: yes
-  roles:
-    - compute-prep
-
-- name: Deploy compute nodes, create configuration
-  hosts: head
-  roles:
-    - juju-compute-setup
-    - compute-node-config
     - compute-node-enable-maas