--- a/util/pigpiod.service
+++ b/util/pigpiod.service
@@ -1,10 +1,9 @@
 [Unit]
-Description=Pigpio daemon
-
+Description=Daemon required to control GPIO pins via pigpio
 [Service]
+ExecStart=/usr/bin/pigpiod -l
+ExecStop=/bin/systemctl kill pigpiod
 Type=forking
-PIDFile=pigpio.pid
-ExecStart=/usr/bin/pigpiod
 
 [Install]
 WantedBy=multi-user.target
