diff --git a/ansible/node.yml b/ansible/node.yml
index 68bfcf239675f18794eb59cbd2eccacd2f49c792..0ec04f06e0fd9eae44511e09f8a2268785ac6c49 100644
--- a/ansible/node.yml
+++ b/ansible/node.yml
@@ -3,5 +3,4 @@
   hosts: default
   become: true
   roles:
-    - { name: 'cheaha.node', tags: 'cheaha.node' }
     - { name: 'compute_packages', tags: 'compute_packages' }
diff --git a/ansible/roles/cheaha.node/tasks/main.yml b/ansible/roles/cheaha.node/tasks/main.yml
index a308992a037b7f8523d0ae6af22baf85d190f767..cf2641cc6d091201ccd6cf79d035d1546924a647 100644
--- a/ansible/roles/cheaha.node/tasks/main.yml
+++ b/ansible/roles/cheaha.node/tasks/main.yml
@@ -13,27 +13,9 @@
     path: /etc/dhcp/dhclient.conf
     insertbefore: BOF
     line: 'append domain-name " cm.cluster rc.uab.edu ib.cluster drac.cluster eth.cluster ib-hdr.cluster";'
-- name: Install prerequisite packages
-  yum:
-    name: epel-release
-    state: present
 - name: Disable SELinux
   ansible.posix.selinux:
     state: disabled
-- name: Copy cm.repo into place (consider making this a template)
-  ansible.builtin.copy:
-    src: cm.repo
-    dest: /etc/yum.repos.d/cm.repo
-    owner: root
-    group: root
-    mode: 0644
-- name: Copy CM repo GPG key
-  ansible.builtin.copy:
-    src: RPM-GPG-KEY-cm
-    dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-cm
-    owner: root
-    group: root
-    mode: 0644
 - name: Create slurm group
   ansible.builtin.group:
     name: slurm
@@ -45,19 +27,6 @@
     state: present
     uid: 450
     group: slurm
-- name: Install required packages
-  yum:
-    name:
-      - slurm-client-18.08.9
-      - munge-0.5.13
-      - openldap-servers-2.4.48
-      - Lmod-7.7.14
-      - cm-modules-init-client-8.2
-      - cmdaemon
-      - nss-pam-ldapd
-      - ruby
-      - python3
-    state: present
 - name: Update nsswitch.conf to look for ldap
   ansible.builtin.replace:
     dest: /etc/nsswitch.conf
diff --git a/ansible/roles/compute_packages/tasks/main.yml b/ansible/roles/compute_packages/tasks/main.yml
index 2dafc21fd02d706921ed1571a8a6ee7ee684c580..76c3be475b332f62536bd3e0c228ba953f522725 100644
--- a/ansible/roles/compute_packages/tasks/main.yml
+++ b/ansible/roles/compute_packages/tasks/main.yml
@@ -1,5 +1,9 @@
 ---
 # tasks file for cheaha.packages
+- name: Install prerequisite packages
+  yum:
+    name: epel-release
+    state: present
 
 - name: Copy yum repo files into place
   ansible.builtin.copy:
@@ -9,17 +13,40 @@
     group: root
     mode: 0644
   loop:
+    - cm.repo
     - ceph.repo
     - dell-system-update.repo
     - elastic.repo
     - nux-dextop.repo
     - TurboVNC.repo
 
+- name: Copy CM repo GPG key
+  ansible.builtin.copy:
+    src: RPM-GPG-KEY-cm
+    dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-cm
+    owner: root
+    group: root
+    mode: 0644
+
 - name: Install openstack-rocky repo
   ansible.builtin.yum:
     name: centos-release-openstack-rocky
     state: present
 
+- name: Install required packages
+  yum:
+    name:
+      - slurm-client-18.08.9
+      - munge-0.5.13
+      - openldap-servers-2.4.48
+      - Lmod-7.7.14
+      - cm-modules-init-client-8.2
+      - cmdaemon
+      - nss-pam-ldapd
+      - ruby
+      - python3
+    state: present
+
 - name: Install system packages
   ansible.builtin.yum:
     name: "{{ lookup('file', '{{ pkg_list_file }}').splitlines() }}"