diff --git a/ansible/compute.yml b/ansible/compute.yml
index 200342c4201d36e69893761cbfda4c676976e65d..4003b8f769c59c1947b4c4dfbb7a6dac7a8844ae 100644
--- a/ansible/compute.yml
+++ b/ansible/compute.yml
@@ -1,7 +1,4 @@
 ---
-- name: Setup node for use as a virtual cheaha node
-  ansible.builtin.import_playbook: cheaha.yml
-
 - name: Setup node for use as a virtual compute node
   hosts: default
   become: true
@@ -9,3 +6,6 @@
     - { name: 'install_packages', tags: 'install_packages' }
     - { name: 'pam_slurm_adopt', tags: 'pam_slurm_adopt' }
     - { name: 'lmod_user', tags: 'lmod_user'}
+
+- name: Setup node for use as a virtual cheaha node
+  ansible.builtin.import_playbook: cheaha.yml
diff --git a/ansible/ood.yml b/ansible/ood.yml
index d5ecc36ddb9683dd01bdc2c915b4448cf268e7c4..e07ce2362ba5d1860f2bfa4d2a24a16441a90a22 100644
--- a/ansible/ood.yml
+++ b/ansible/ood.yml
@@ -1,9 +1,9 @@
 ---
-- name: Setup node for use as a virtual cheaha node
-  ansible.builtin.import_playbook: cheaha.yml
-
 - name: Setup node for use as a virtual ood node
   hosts: default
   become: true
   roles:
     - { name: 'install_packages', tags: 'install_packages' }
+
+- name: Setup node for use as a virtual cheaha node
+  ansible.builtin.import_playbook: cheaha.yml