diff --git a/paperless.conf.build.sh b/paperless.conf.build.sh
index 2997a59..653feb2 100755
--- a/paperless.conf.build.sh
+++ b/paperless.conf.build.sh
@@ -34,7 +34,7 @@ PAPERLESS_URL=${PAPERLESS_URL}
 PAPERLESS_CSRF_TRUSTED_ORIGINS=${PAPERLESS_CSRF_TRUSTED_ORIGINS:-${PAPERLESS_URL}}
 PAPERLESS_COOKIE_PREFIX=ngx-${BUILD_TAG}-
 
-PAPERLESS_OCR_MODE=force
+PAPERLESS_OCR_MODE=${PAPERLESS_OCR_MODE:-force}
 PAPERLESS_OCR_DESKEW=false
 PAPERLESS_OCR_LANGUAGE=deu+eng
 
diff --git a/startstop.build.sh b/startstop.build.sh
index dd73dc5..72b802e 100755
--- a/startstop.build.sh
+++ b/startstop.build.sh
@@ -27,22 +27,6 @@ function pwait() {
   fi
 }
 
-#### nginx ####
-
-srv_nginx_start() {
-    nginx -t
-    trap rm_pidfiles EXIT
-    nginx -g 'daemon off;'
-}
-
-srv_nginx_restart() {
-    nginx -s reload
-}
-
-srv_nginx_stop() {
-    nginx -s quit || rm -fv "${DEVSHM}"/nginx.pid
-}
-
 #### redis ####
 
 srv_redis_start() {
@@ -56,27 +40,6 @@ srv_redis_start() {
     redis-server "\${_opts[@]}"
 }
 
-#### gunicorn ####
-
-srv_gunicorn_start() {
-
-    cd "${PROJECT}/paperless-ngx/src"
-
-
-    _opts=(
-      --config ../gunicorn.conf.py
-      paperless.asgi:application
-      --bind "unix:${DEVSHM}/gunicorn.sock"
-      --pid "${DEVSHM}/gunicorn.pid"
-      --error-logfile "${LOGDIR}/gunicorn-error.log"
-      --access-logfile "${LOGDIR}/gunicorn-access.log"
-      --worker-tmp-dir "${DEVSHM}"
-    )
-    trap rm_pidfiles EXIT
-
-    gunicorn "\${_opts[@]}"
-}
-
 #### granian ####
 
 srv_granian_start() {
@@ -107,13 +70,22 @@ srv_granian_start() {
     granian "\${_opts[@]}"
 }
 
+srv_granian_waitup() {
+    until ( printf "" 2>>/dev/null >>/dev/tcp/${PAPERLESS_BIND_ADDR}/${PAPERLESS_PORT} ); do
+      echo "waiting for granian server to be ready..."
+      sleep 1
+    done
+}
+
 #### consumer ####
 
 srv_consumer_start() {
 
-    cd "${PROJECT}/paperless-ngx/src"
     trap rm_pidfiles EXIT
 
+    cd "${PROJECT}/paperless-ngx/src"
+    srv_granian_waitup
+
     ./manage.py document_consumer
 }
 
@@ -121,9 +93,11 @@ srv_consumer_start() {
 
 srv_scheduler_start() {
 
-    cd "${PROJECT}/paperless-ngx/src"
     trap rm_pidfiles EXIT
 
+    cd "${PROJECT}/paperless-ngx/src"
+    srv_granian_waitup
+
     celery --app paperless beat --loglevel INFO
 }
 
@@ -131,9 +105,11 @@ srv_scheduler_start() {
 
 srv_worker_start() {
 
-    cd "${PROJECT}/paperless-ngx/src"
     trap rm_pidfiles EXIT
 
+    cd "${PROJECT}/paperless-ngx/src"
+    srv_granian_waitup
+
     celery --app paperless worker --loglevel WARNING
 }
 
@@ -252,7 +228,6 @@ cmd="\${1:-help}"
 srv="\${2:-all}"
 
 if [[ \${srv} = 'all' ]]; then
-  # _srv=(redis nginx granian consumer scheduler worker)
   _srv=(redis granian consumer scheduler worker)
 
   if [[ \${cmd} = 'start' ]]; then