diff --git a/defaults/main.yml b/defaults/main.yml
index 6d98ea3..0c74210 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -36,7 +36,9 @@ __slurm_config_default:
   SlurmctldLogFile: "{{ '/var/log/slurm-llnl/slurmctld.log' if __slurm_debian else omit }}"
   SlurmctldPidFile: >-
     {{
-        '/var/run/slurm-llnl/slurmctld.pid' if __slurm_debian else omit
+        '/run/slurmctld.pid' if __slurm_debian and ansible_distribution_release == 'focal' else (
+        '/var/run/slurm-llnl/slurmctld.pid' if __slurm_debian else
+        omit)
     }}
   StateSaveLocation: >-
     {{
@@ -49,7 +51,9 @@ __slurm_config_default:
   SlurmdLogFile: "{{ '/var/log/slurm-llnl/slurmd.log' if __slurm_debian else omit }}"
   SlurmdPidFile: >-
     {{
-        '/var/run/slurm-llnl/slurmd.pid' if __slurm_debian else omit
+        '/run/slurmd.pid' if __slurm_debian and ansible_distribution_release == 'focal' else (
+        '/var/run/slurm-llnl/slurmd.pid' if __slurm_debian else
+        omit)
     }}
   SlurmdSpoolDir: >-
     {{