diff --git a/scripts/etc/init.d/akanda-router-api-server b/scripts/etc/init.d/akanda-router-api-server
index 9ec9f3e..8e5d002 100755
--- a/scripts/etc/init.d/akanda-router-api-server
+++ b/scripts/etc/init.d/akanda-router-api-server
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 DAEMON="/usr/local/bin/gunicorn"
 NAME="akanda-router-api-server"
 OPTIONS="-c /etc/akanda_gunicorn_config akanda.router.api.server:app"
-PIDFILE=/tmp/gunicorn.pid
+PIDFILE=/var/run/gunicorn.pid
 
 test -x $DAEMON || exit 0
 
diff --git a/scripts/etc/init.d/metadata b/scripts/etc/init.d/metadata
index ee00acf..bdddbaa 100755
--- a/scripts/etc/init.d/metadata
+++ b/scripts/etc/init.d/metadata
@@ -2,6 +2,7 @@
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 DAEMON="/usr/local/bin/akanda-metadata-proxy"
+NAME="akanda-metadata-proxy"
 OPTIONS="/etc/metadata.conf"
 PIDFILE=/var/run/metadata.pid
 
@@ -11,12 +12,12 @@ test -x $DAEMON || exit 0
 
 case "$1" in
   start)
-	log_daemon_msg "Starting akanda-metadata-proxy" "akanda-metadata-proxy"
+	log_daemon_msg "Starting $NAME" $NAME
 	start_daemon -p $PIDFILE $DAEMON $OPTIONS
 	log_end_msg $?
     ;;
   stop)
-	log_daemon_msg "Stopping akanda-metadata-proxy" "akanda-metadata-proxy"
+	log_daemon_msg "Stopping $NAME" $NAME
 	killproc -p $PIDFILE $DAEMON
 	log_end_msg $?
     ;;
@@ -25,7 +26,7 @@ case "$1" in
     $0 start
     ;;
   status)
-    status_of_proc -p $PIDFILE $DAEMON akanda-metadata-proxy && exit 0 || exit $?
+    status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
     ;;
   *)
     echo "Usage: /etc/init.d/akanda-metadata-proxy {start|stop|restart|force-reload|status}"