diff --git a/etc/slurmctld.service.in b/etc/slurmctld.service.in

index 6f175ad651..82a128ac0a 100644

--- a/etc/slurmctld.service.in

+++ b/etc/slurmctld.service.in

@@ -8,7 +8,7 @@ Type=forking

 EnvironmentFile=-/etc/sysconfig/slurmctld

 ExecStart=@sbindir@/slurmctld $SLURMCTLD_OPTIONS

 ExecReload=/bin/kill -HUP $MAINPID

-PIDFile=/var/run/slurmctld.pid

+PIDFile=/var/run/slurm/slurmctld.pid

 LimitNOFILE=65536

 @SYSTEMD_TASKSMAX_OPTION@

diff --git a/etc/slurmd.service.in b/etc/slurmd.service.in

index b36433dd7d..146b6574d2 100644

--- a/etc/slurmd.service.in

+++ b/etc/slurmd.service.in

@@ -8,7 +8,7 @@ Type=forking

 EnvironmentFile=-/etc/sysconfig/slurmd

 ExecStart=@sbindir@/slurmd $SLURMD_OPTIONS

 ExecReload=/bin/kill -HUP $MAINPID

-PIDFile=/var/run/slurmd.pid

+PIDFile=/var/run/slurm/slurmd.pid

 KillMode=process

 LimitNOFILE=131072

 LimitMEMLOCK=infinity

diff --git a/etc/slurmdbd.service.in b/etc/slurmdbd.service.in

index c80feb9d7c..97a95c0e57 100644

--- a/etc/slurmdbd.service.in

+++ b/etc/slurmdbd.service.in

@@ -8,7 +8,7 @@ Type=forking

 EnvironmentFile=-/etc/sysconfig/slurmdbd

 ExecStart=@sbindir@/slurmdbd $SLURMDBD_OPTIONS

 ExecReload=/bin/kill -HUP $MAINPID

-PIDFile=/var/run/slurmdbd.pid

+PIDFile=/var/run/slurm/slurmdbd.pid

 LimitNOFILE=65536

 @SYSTEMD_TASKSMAX_OPTION@