diff --git a/ansible/base.yml b/ansible/base.yml
index 0ec04f06e0fd9eae44511e09f8a2268785ac6c49..93bc7a096305a74b25e4a7a479eea42fcf404e0d 100644
--- a/ansible/base.yml
+++ b/ansible/base.yml
@@ -1,6 +1,6 @@
 ---
-- name: Setup node for use as a cluster host
+- name: Install base packages
   hosts: default
   become: true
   roles:
-    - { name: 'compute_packages', tags: 'compute_packages' }
+    - { name: 'install_packages', tags: 'install_packages' }
diff --git a/ansible/cheaha.yml b/ansible/cheaha.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1ddc0180f9b2ab11fa20555268a6748c8f9f0d68
--- /dev/null
+++ b/ansible/cheaha.yml
@@ -0,0 +1,10 @@
+---
+- name: Setup node for use as a virtual cheaha node
+  hosts: default
+  become: true
+  roles:
+    - { name: 'cheaha.node', tags: 'cheaha.node' }
+    - { name: 'install_packages', tags: 'install_packages' }
+    - { name: 'nfs_mounts', tags: 'nfs_mounts' }
+    - { name: 'ldap_config', tags: 'ldap_config' }
+    - { name: 'slurm_client', tags: 'slurm_client' }
diff --git a/ansible/compute.yml b/ansible/compute.yml
index 76000fad8ef5eba9bd52d4bce0cdc38f02c32dcf..f62612760ac49c18c410e64caeaf8f16a9b75706 100644
--- a/ansible/compute.yml
+++ b/ansible/compute.yml
@@ -3,6 +3,6 @@
   hosts: default
   become: true
   roles:
-    - { name: 'cheaha.node', tags: 'cheaha.node' }
+    - { name: 'install_packages', tags: 'install_packages' }
     - { name: 'pam_slurm_adopt', tags: 'pam_slurm_adopt' }
     - { name: 'lmod_user', tags: 'lmod_user'}
diff --git a/ansible/gpu.yml b/ansible/gpu.yml
index 1da928e28e9bf5651040bb50709bfc2efd5fb494..5d032dce95f4741643cd86dcfa3783bdfdfa9213 100644
--- a/ansible/gpu.yml
+++ b/ansible/gpu.yml
@@ -1,9 +1,7 @@
 ---
-- name: Run a play
-  ansible.builtin.import_playbook: node-compute.yml
-
 - name: Setup node for use as a cluster host with gpu drivers/pkgs
   hosts: default
   become: true
   roles:
-    - { name: 'nvidia_driver', tags: 'nvidia_driver' }
+    - { name: 'install_packages', tags: 'install_packages' }
+    - { name: 'cuda_driver', tags: 'cuda_driver' }