diff --git a/container_files/usr-local-bin/entrypoint.sh b/container_files/usr-local-bin/entrypoint.sh
index 83e985d6..f220b548 100755
--- a/container_files/usr-local-bin/entrypoint.sh
+++ b/container_files/usr-local-bin/entrypoint.sh
@@ -3,4 +3,10 @@
 . /usr/local/bin/library.sh
 prepConf
 
-exec "$@"
\ No newline at end of file
+if [ "$#" -eq 0 ]; 
+  then
+   finishPrep
+   exec /usr/bin/supervisord -c /opt/tier-support/supervisord.conf
+else
+  exec "$@"
+fi