diff --git a/Dockerfile b/Dockerfile
index 194f3442e..059a557b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ RUN chmod +x /usr/local/bin/pretix && \
     	-r requirements/memcached.txt -r requirements/redis.txt \
 	    -r requirements/py34.txt gunicorn && \
 	mkdir -p data && \
-    chown -R pretixuser:pretixuser /static /pretix /data data && \
+    chown -R pretixuser:pretixuser /pretix /data data && \
 	sudo -u pretixuser make production
 
 USER pretixuser
diff --git a/deployment/docker/nginx.conf b/deployment/docker/nginx.conf
index 875d4901d..98f95f7e7 100644
--- a/deployment/docker/nginx.conf
+++ b/deployment/docker/nginx.conf
@@ -57,7 +57,7 @@ http {
             return 404;
         }
         location /static/ {
-            alias /static/;
+            alias /pretix/src/pretix/static.dist/;
             access_log off;
             expires 365d;
             add_header Cache-Control "public";
diff --git a/deployment/docker/production_settings.py b/deployment/docker/production_settings.py
index 2f6c39546..0f87487ae 100644
--- a/deployment/docker/production_settings.py
+++ b/deployment/docker/production_settings.py
@@ -1,5 +1,4 @@
 from pretix.settings import *
 
 LOGGING['handlers']['mail_admins']['include_html'] = True
-STATIC_ROOT = '/static'
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'