diff --git a/include/systemd/warewulfd.service b/include/systemd/warewulfd.service
index d8abf5ac..e44d1e22 100644
--- a/include/systemd/warewulfd.service
+++ b/include/systemd/warewulfd.service
@@ -10,7 +10,7 @@ User=root
 Group=root
 
 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 da3a59bf..6a778790 100644
--- a/internal/pkg/warewulfd/daemon.go
+++ b/internal/pkg/warewulfd/daemon.go
@@ -13,8 +13,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 {