diff --git a/environments/common/inventory/group_vars/all/openhpc.yml b/environments/common/inventory/group_vars/all/openhpc.yml
index b3ead1845..0fed1c9e6 100644
--- a/environments/common/inventory/group_vars/all/openhpc.yml
+++ b/environments/common/inventory/group_vars/all/openhpc.yml
@@ -54,7 +54,8 @@ openhpc_config_extra: {}
 # additional default slurm.conf parameters for the appliance:
 openhpc_config_default:
   TaskPlugin: task/cgroup,task/affinity
-  ReturnToService: 2 # workaround for templating bug TODO: Remove once on stackhpc.openhpc v1.2.0
+  ProctrackType: proctrack/cgroup
+  JobAcctGatherType: jobacct_gather/cgroup
 
 # additional default slurm.conf parameters when "rebuild" enabled:
 openhpc_config_rebuild: