diff --git a/charms/slurmctld/src/charm.py b/charms/slurmctld/src/charm.py
index c5d34b0..8e75863 100755
--- a/charms/slurmctld/src/charm.py
+++ b/charms/slurmctld/src/charm.py
@@ -311,6 +311,7 @@ def _assemble_slurmctld_parameters() -> str:
             "SlurmctldHost": self.hostname,
             "SlurmctldParameters": _assemble_slurmctld_parameters(),
             "ProctrackType": "proctrack/linuxproc" if is_container() else "proctrack/cgroup",
+            "TaskPlugin": "task/affinity" if is_container() else "task/cgroup,task/affinity",
             **accounting_params,
             **CHARM_MAINTAINED_SLURM_CONF_PARAMETERS,
             **slurmd_parameters,