diff --git a/include/systemd/warewulfd.service.in b/include/systemd/warewulfd.service.in
index 65981fcb..a343a0df 100644
--- a/include/systemd/warewulfd.service.in
+++ b/include/systemd/warewulfd.service.in
@@ -5,7 +5,7 @@ After=network-online.target
 AssertFileIsExecutable=@BINDIR@/wwctl
 
 [Service]
-Type=notify
+Type=simple
 User=root
 Group=root
 
diff --git a/overlays/wwinit/etc/systemd/system/wwclient.service b/overlays/wwinit/etc/systemd/system/wwclient.service
index af958807..4cc81927 100644
--- a/overlays/wwinit/etc/systemd/system/wwclient.service
+++ b/overlays/wwinit/etc/systemd/system/wwclient.service
@@ -4,11 +4,11 @@ After=network.target
 After=local-fs.target
 
 [Service]
-Type=simple
+Type=notify
 ExecStart=/warewulf/bin/wwclient
 ExecReload=/bin/kill -s SIGHUP "$MAINPID"
 PIDFile=/var/run/wwclient.pid
-TimeoutSec=5
+TimeoutSec=60
  
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target