diff --git a/include/systemd/warewulfd.service b/include/systemd/warewulfd.service
index 992f3614..f3290524 100644
--- a/include/systemd/warewulfd.service
+++ b/include/systemd/warewulfd.service
@@ -10,7 +10,7 @@ User=root
 Group=warewulf
 
 ExecStart=/usr/bin/wwctl server start
-PIDFile=/tmp/warewulfd.pid
+PIDFile=/var/run/warewulfd.pid
 Restart=always
 
 [Install]
diff --git a/internal/pkg/warewulfd/daemon.go b/internal/pkg/warewulfd/daemon.go
index c28ca1e9..10b7b998 100644
--- a/internal/pkg/warewulfd/daemon.go
+++ b/internal/pkg/warewulfd/daemon.go
@@ -14,8 +14,8 @@ import (
 )
 
 const (
-	WAREWULFD_PIDFILE = "/tmp/warewulfd.pid"
-	WAREWULFD_LOGFILE = "/tmp/warewulfd.log"
+	WAREWULFD_PIDFILE = "/var/run/warewulfd.pid"
+	WAREWULFD_LOGFILE = "/var/log/warewulfd.log"
 )
 
 func DaemonStart() error {