diff --git a/group_vars/all.yml b/group_vars/all.yml
index bfc8998a..00a4cd68 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -5,7 +5,7 @@ mgmt_hostname: "{{ ansible_local.citc.mgmt_hostname }}"
 users: []
 
 # From https://www.schedmd.com/downloads.php
-slurm_version: 20.02
+slurm_version: 20.11
 
 slurm_cluster_name: cluster
 slurm_control_machine: "{{ mgmt_hostname }}"
diff --git a/group_vars/compute.yml b/group_vars/compute.yml
index 550ce43f..4290e1fb 100644
--- a/group_vars/compute.yml
+++ b/group_vars/compute.yml
@@ -1,7 +1,7 @@
 ---
 slurm_packages:
   - slurmd
-  - libpmi
+  - pmi
 
 slurm_role: compute
 
@@ -14,7 +14,9 @@ mpi_packages:
   google:
     - mpich
     - openmpi
-  aws: []
+  aws:
+    - mpich
+    - openmpi
 
 monitoring_role: client
 
diff --git a/group_vars/management.yml b/group_vars/management.yml
index dc96244a..d1550a95 100644
--- a/group_vars/management.yml
+++ b/group_vars/management.yml
@@ -5,7 +5,7 @@ slurm_accounting_db_password: "{{ lookup('password', '/tmp/slurmpasswordfile cha
 slurm_packages:
   - slurmctld
   - slurmdbd
-  - libpmi
+  - pmi
 
 slurm_role: mgmt
 
@@ -15,7 +15,6 @@ slurm_elastic:
 
 install_packages:
   - xorg-x11-xauth
-  - openmpi-devel
   - python3-devel
   - "@Development Tools"
   - vim
@@ -27,7 +26,9 @@ mpi_packages:
   google:
     - openmpi-devel
     - mpich-devel
-  aws: []
+  aws:
+    - openmpi-devel
+    - mpich-devel
 
 monitoring_role: master
 grafana_admin_password: "{{ lookup('password', '/tmp/grafanapasswordfile chars=ascii_letters,digits,hexdigits') }}"
diff --git a/roles/slurm/molecule/compute/molecule.yml b/roles/slurm/molecule/compute/molecule.yml
index dd083085..29692ad6 100644
--- a/roles/slurm/molecule/compute/molecule.yml
+++ b/roles/slurm/molecule/compute/molecule.yml
@@ -19,8 +19,8 @@ provisioner:
         slurm_role: compute
         slurm_packages:
           - slurmd
-          - libpmi
-        slurm_version: 20.02
+          - pmi
+        slurm_version: 20.11
         slurm_cluster_name: cluster
         slurm_control_machine: mgmt
         filesystem_mount_point: /shared
diff --git a/roles/slurm/molecule/mgmt/molecule.yml b/roles/slurm/molecule/mgmt/molecule.yml
index 1713a659..82cd6431 100644
--- a/roles/slurm/molecule/mgmt/molecule.yml
+++ b/roles/slurm/molecule/mgmt/molecule.yml
@@ -20,8 +20,8 @@ provisioner:
         slurm_packages:
           - slurmctld
           - slurmdbd
-          - libpmi
-        slurm_version: 20.02
+          - pmi
+        slurm_version: 20.11
         slurm_cluster_name: cluster
         slurm_control_machine: mgmt
         filesystem_mount_point: /shared
diff --git a/roles/slurm/tasks/main.yml b/roles/slurm/tasks/main.yml
index debd807c..f68f32e2 100644
--- a/roles/slurm/tasks/main.yml
+++ b/roles/slurm/tasks/main.yml
@@ -64,14 +64,6 @@
     enabled: yes
     state: started
 
-- name: Add Slurm repository
-  yum_repository:
-    name: slurm
-    description: Slurm
-    baseurl: https://download.opensuse.org/repositories/home:/Milliams:/citc/EPEL_8_CentOS/
-    gpgcheck: yes
-    gpgkey: https://download.opensuse.org/repositories/home:/Milliams:/citc/EPEL_8_CentOS/repodata/repomd.xml.key
-
 - name: create slurm group
   group:
     name: slurm
@@ -143,7 +135,7 @@
     dest: /etc/slurm/slurmdbd.conf
     owner: slurm
     group: slurm
-    mode: 0400
+    mode: 0600
   when: slurm_role == "mgmt"
   notify:
     - restart slurmdbd