diff --git a/etc/systemd/system/pandora-encoding.service b/etc/systemd/system/pandora-encoding.service
index b2a48626..fa791feb 100644
--- a/etc/systemd/system/pandora-encoding.service
+++ b/etc/systemd/system/pandora-encoding.service
@@ -7,14 +7,16 @@ Type=simple
 Restart=always
 User=pandora
 Group=pandora
+EnvironmentFile=/srv/pandora/pandora/encoding.conf
 PIDFile=/run/pandora/encoding.pid
 WorkingDirectory=/srv/pandora/pandora
 ExecStart=/srv/pandora/bin/celery \
     -A app worker \
     -Q encoding -n pandora-encoding \
     --pidfile /run/pandora/encoding.pid \
-    --maxtasksperchild 500 \
-    -l INFO
+    -c $CONCURRENCY \
+    --maxtasksperchild $MAX_TASKS_PER_CHILD \
+    -l $LOGLEVEL
 ExecReload=/bin/kill -TERM $MAINPID
 
 [Install]
diff --git a/etc/systemd/system/pandora-tasks.service b/etc/systemd/system/pandora-tasks.service
index 19cf04af..d8fe1b58 100644
--- a/etc/systemd/system/pandora-tasks.service
+++ b/etc/systemd/system/pandora-tasks.service
@@ -7,14 +7,16 @@ Type=simple
 Restart=always
 User=pandora
 Group=pandora
+EnvironmentFile=/srv/pandora/pandora/tasks.conf
 PIDFile=/run/pandora/tasks.pid
 WorkingDirectory=/srv/pandora/pandora
 ExecStart=/srv/pandora/bin/celery \
     -A app worker \
     -Q default,celery -n pandora-default \
     --pidfile /run/pandora/tasks.pid \
-    --maxtasksperchild 1000 \
-    -l INFO
+    -c $CONCURRENCY \
+    --maxtasksperchild $MAX_TASKS_PER_CHILD \
+    -l $LOGLEVEL
 ExecReload=/bin/kill -TERM $MAINPID
 
 [Install]
diff --git a/pandora/app/views.py b/pandora/app/views.py
index 60a173e2..94e1c08c 100644
--- a/pandora/app/views.py
+++ b/pandora/app/views.py
@@ -59,11 +59,11 @@ def redirect_url(request, url):
     if settings.CONFIG['site'].get('sendReferrer', False):
         return redirect(url)
     else:
-        return HttpResponse('<script>document.location.href=%s;</script>'%json.dumps(url))
+        return HttpResponse('<script>document.location.href=%s;</script>' % json.dumps(url))
 
 def opensearch_xml(request):
     osd = ET.Element('OpenSearchDescription')
-    osd.attrib['xmlns']="http://a9.com/-/spec/opensearch/1.1/"
+    osd.attrib['xmlns'] = "http://a9.com/-/spec/opensearch/1.1/"
     e = ET.SubElement(osd, 'ShortName')
     e.text = settings.SITENAME
     e = ET.SubElement(osd, 'Description')
diff --git a/pandora/encoding.conf b/pandora/encoding.conf
new file mode 100644
index 00000000..af15426c
--- /dev/null
+++ b/pandora/encoding.conf
@@ -0,0 +1,3 @@
+LOGLEVEL=info
+MAX_TASKS_PER_CHILD=500
+CONCURRENCY=1
diff --git a/pandora/tasks.conf b/pandora/tasks.conf
new file mode 100644
index 00000000..245a3562
--- /dev/null
+++ b/pandora/tasks.conf
@@ -0,0 +1,3 @@
+LOGLEVEL=info
+MAX_TASKS_PER_CHILD=1000
+CONCURRENCY=2