diff --git a/Dockerfile b/Dockerfile
index 5bcfa7bf293c757bc5977f13449f1b08cb5d10fb..1d19e956362b01845479e8d0687dc2c5568bd800 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2.7.18-buster
+FROM python:3.6
 
 RUN mkdir /app
 WORKDIR /app
@@ -10,9 +10,10 @@ COPY . .
 
 RUN bash -c 'adduser --disabled-login --quiet --gecos app app &&  \
              chmod -R o+r /app/ && \
-             chmod o+x /app/run.sh'
+             chmod o+x /app/run_server.sh && \
+             chmod o+x /app/run_worker.sh'
 USER app
 
 EXPOSE 8000
 
-CMD ["bash", "run.sh"]
+CMD ["bash", "run_server.sh"]
diff --git a/run.sh b/run_server.sh
similarity index 100%
rename from run.sh
rename to run_server.sh
diff --git a/run_worker.sh b/run_worker.sh
new file mode 100644
index 0000000000000000000000000000000000000000..393ce5ff6b1521d363ee8f9e52e837683236f94a
--- /dev/null
+++ b/run_worker.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# exit on error
+set -e
+
+# start celeryd
+exec celery worker --app helios --events --beat --concurrency 1
diff --git a/settings.py b/settings.py
index ce9b02ea75483863cab3d314c39eeb5e4fc3a66f..e925e479fe797615a56fb4450ac8b47be689ca3c 100644
--- a/settings.py
+++ b/settings.py
@@ -14,7 +14,7 @@ def get_from_env(var, default):
     else:
         return default
 
-DEBUG = (get_from_env('DEBUG', '1') == '1')
+DEBUG = (get_from_env('DEBUG', '0') == '1')
 
 # add admins of the form:
 #    ('Ben Adida', 'ben@adida.net'),
@@ -287,3 +287,9 @@ if ROLLBAR_ACCESS_TOKEN:
 PIRATI_REALM_URL = get_from_env('PIRATI_REALM_URL', '')
 PIRATI_CLIENT_ID = get_from_env('PIRATI_CLIENT_ID', '')
 PIRATI_CLIENT_SECRET = get_from_env('PIRATI_CLIENT_SECRET', '')
+
+# override defaults
+DEFAULT_FROM_EMAIL = "helios@pirati.cz"
+DEFAULT_FROM_NAME = "Pirati - Helios Voting"
+WELCOME_MESSAGE = "Vítejte na hlasovacím systému České pirátské strany"
+SITE_TITLE = "Hlasovací systém Helios | Česká piratská strana"