diff --git a/files/nodepool-deleter.init b/files/nodepool-deleter.init
index 86cb50c..1f9c5e5 100755
--- a/files/nodepool-deleter.init
+++ b/files/nodepool-deleter.init
@@ -49,7 +49,7 @@ do_start()
 	start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \
-		$DAEMON_ARGS \
+		$DAEMON_ARGS -p $PIDFILE \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
diff --git a/files/nodepool-launcher.init b/files/nodepool-launcher.init
index cd3acaa..77ac4bf 100755
--- a/files/nodepool-launcher.init
+++ b/files/nodepool-launcher.init
@@ -49,7 +49,7 @@ do_start()
 	start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \
-		$DAEMON_ARGS \
+		$DAEMON_ARGS -p $PIDFILE \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
diff --git a/files/nodepool.init b/files/nodepool.init
index 4c6815a..22e1668 100755
--- a/files/nodepool.init
+++ b/files/nodepool.init
@@ -49,7 +49,7 @@ do_start()
 	start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \
-		$DAEMON_ARGS \
+		$DAEMON_ARGS -p $PIDFILE \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend