diff --git a/ansible/roles/cheaha.node/tasks/main.yml b/ansible/roles/cheaha.node/tasks/main.yml
index b00c48511e2b95b42997a5b800839a67f9d3236d..cdbe0e7a0b9f8a98537bb0f929bed00e82f8e389 100644
--- a/ansible/roles/cheaha.node/tasks/main.yml
+++ b/ansible/roles/cheaha.node/tasks/main.yml
@@ -16,17 +16,20 @@
 - name: Disable SELinux
   ansible.posix.selinux:
     state: disabled
-- name: Create slurm group
-  ansible.builtin.group:
-    name: slurm
-    state: present
-    gid: 450
-- name: Create slurm user
-  ansible.builtin.user:
-    name: slurm
-    state: present
-    uid: 450
-    group: slurm
+- 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: Install required packages
   yum:
     name:
@@ -45,20 +48,6 @@
     user: root
     state: present
     key: "{{ root_ssh_key }}"
-- name: Copy munge key
-  ansible.builtin.copy:
-    src: munge.key
-    dest: /etc/munge/munge.key
-    owner: daemon
-    group: root
-    mode: 0400
-- name: Enable services
-  ansible.builtin.service:
-    name: "{{ item }}"
-    enabled: yes
-  loop:
-    - munge
-    - slurmd
 - name: Set timezone to America/Chicago
   community.general.timezone:
     name: America/Chicago
diff --git a/ansible/roles/slurm_client/tasks/main.yml b/ansible/roles/slurm_client/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b4e001ad069907af43549822158627078fd52161
--- /dev/null
+++ b/ansible/roles/slurm_client/tasks/main.yml
@@ -0,0 +1,29 @@
+---
+- name: Create slurm group
+  ansible.builtin.group:
+    name: slurm
+    state: present
+    gid: 450
+
+- name: Create slurm user
+  ansible.builtin.user:
+    name: slurm
+    state: present
+    uid: 450
+    group: slurm
+
+- name: Copy munge key
+  ansible.builtin.copy:
+    src: munge.key
+    dest: /etc/munge/munge.key
+    owner: daemon
+    group: root
+    mode: 0400
+
+- name: Enable services
+  ansible.builtin.service:
+    name: "{{ item }}"
+    enabled: yes
+  loop:
+    - munge
+    - slurmd