diff --git a/utils/solar-celery b/utils/solar-celery
index 90a4d030..40f66d61 100755
--- a/utils/solar-celery
+++ b/utils/solar-celery
@@ -9,18 +9,16 @@
 # Default-Stop:     0 1 6
 ### END INIT INFO
 
-export SOLAR_CONFIG_OVERRIDE=/.solar_config_override
-START="$(/usr/bin/env celery multi start 2 -A solar.orchestration.runner -P gevent -c:1 1 -c:2 1000 -Q:1 scheduler,system_log -Q:2 celery --pidfile=/var/run/celery/%N.pid --logfile=/var/run/celery/%N.log)"
-STOP="$(/usr/bin/env celery multi stopwait 2 --pidfile=/var/run/celery/%N.pid)"
+export SOLAR_CONFIG_OVERRIDE=${SOLAR_CONFIG_OVERRIDE:-/.solar_config_override}
 NAME=solar-celery
 
 
 case "$1" in
   start)
-    "{$START}"
+    /usr/bin/env celery multi start 2 -A solar.orchestration.runner -P gevent -c:1 1 -c:2 1000 -Q:1 scheduler,system_log -Q:2 celery --pidfile=/var/run/celery/%N.pid --logfile=/var/run/celery/%N.log
     ;;
   stop)
-    "{$STOP}"
+    /usr/bin/env celery multi stopwait 2 --pidfile=/var/run/celery/%N.pid
     ;;
   restart|force-reload)
     ${0} stop