diff --git a/environments/site/inventory/group_vars/all/openhpc.yml b/environments/site/inventory/group_vars/all/openhpc.yml
index fff567299..951baf146 100644
--- a/environments/site/inventory/group_vars/all/openhpc.yml
+++ b/environments/site/inventory/group_vars/all/openhpc.yml
@@ -4,5 +4,6 @@
 openhpc_config_extra:
   MpiDefault: pmix
   AccountingStorageEnforce: 'associations,limits,qos,safe'
+  SelectTypeParameters: CR_Core_Memory
 
 openhpc_job_maxtime: '1-0'
diff --git a/environments/staging/hooks/post.yml b/environments/staging/hooks/post.yml
index a64abfb4a..984076d30 100644
--- a/environments/staging/hooks/post.yml
+++ b/environments/staging/hooks/post.yml
@@ -3,3 +3,15 @@
 # environments/site/hooks/pre.yml:
 - name: Import parent hook
   import_playbook: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}/../site/hooks/post.yml"
+
+- name: Staging-specific Slurm config
+  hosts: control
+  become: true
+  tags: openhpc
+  tasks:
+    - name: Is demo_user associated
+      ansible.builtin.command: "sacctmgr --json show assoc user=demo_user"
+      register: demo_user_assoc
+    - name: Set Slurm account for demo_user
+      ansible.builtin.command: "sacctmgr --immediate create user name=demo_user defaultaccount=root"
+      when: not (demo_user_assoc.stdout | from_json)["associations"]
diff --git a/environments/staging/inventory/group_vars/all/openhpc.yml b/environments/staging/inventory/group_vars/all/openhpc.yml
index b6c74b7d9..ed97d539c 100644
--- a/environments/staging/inventory/group_vars/all/openhpc.yml
+++ b/environments/staging/inventory/group_vars/all/openhpc.yml
@@ -1,3 +1 @@
 ---
-openhpc_config_extra:
-  MpiDefault: pmix