diff --git a/etc/init/pandora-cron.conf b/etc/init/pandora-cron.conf
index 309e08e5d..f072ffa64 100644
--- a/etc/init/pandora-cron.conf
+++ b/etc/init/pandora-cron.conf
@@ -19,7 +19,8 @@ end script
 
 exec start-stop-daemon \
     --start -c $USER -d $VENV/pandora \
-    -n pandora-cron --exec $VENV/bin/python -- \
+    --pidfile /var/run/pandora/pandora-cron.pid \
+    --exec $VENV/bin/python -- \
     $VENV/pandora/manage.py celerybeat \
        -s /var/run/pandora/celerybeat-schedule \
        --pidfile /var/run/pandora/pandora-cron.pid \
diff --git a/etc/init/pandora-encoding.conf b/etc/init/pandora-encoding.conf
index 81b4fdb47..8fb217d1c 100644
--- a/etc/init/pandora-encoding.conf
+++ b/etc/init/pandora-encoding.conf
@@ -19,7 +19,8 @@ end script
 
 exec start-stop-daemon \
     --start -c $USER -d $VENV/pandora \
-    -n pandora-encoding --exec $VENV/bin/python -- \
+    --pidfile /var/run/pandora/pandora-encoding.pid \
+    --exec $VENV/bin/python -- \
     $VENV/pandora/manage.py celeryd \
        -Q encoding \
        -n pandora-encoding \
diff --git a/etc/init/pandora-tasks.conf b/etc/init/pandora-tasks.conf
index 7807a8b4b..f986e1384 100644
--- a/etc/init/pandora-tasks.conf
+++ b/etc/init/pandora-tasks.conf
@@ -19,7 +19,8 @@ end script
 
 exec start-stop-daemon \
     --start -c $USER -d $VENV/pandora \
-    -n pandora-tasks --exec $VENV/bin/python -- \
+    --pidfile /var/run/pandora/pandora-tasks.pid \
+    --exec $VENV/bin/python -- \
     $VENV/pandora/manage.py celeryd \
        -Q default,celery \
        -n pandora-default \