diff --git a/Dockerfile b/Dockerfile
index 3cebf6ed15b0cb4022401cb7dfd5db5ab14367bc..5c27542638c3dd55a33cbbe92c62060d18606d91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK 1
 ENV PIP_NO_CACHE_DIR 1
 
 # Configure app settings for build and runtime
-ENV ALEKSIS_static__root /var/lib/aleksis/static
+ENV ALEKSIS_static__root /usr/share/aleksis/static
 ENV ALEKSIS_media__root /var/lib/aleksis/media
 ENV ALEKSIS_backup__location /var/lib/aleksis/backups
 
@@ -30,7 +30,7 @@ WORKDIR /usr/src/app
 COPY LICENCE.rst README.rst manage.py poetry.lock pyproject.toml ./
 COPY aleksis ./aleksis/
 RUN set -e; \
-    mkdir -p /var/lib/aleksis/media /var/lib/aleksis/static /var/lib/aleksis/backups; \
+    mkdir -p /var/lib/aleksis/media /usr/share/aleksis/static /var/lib/aleksis/backups; \
     eatmydata pip install poetry; \
     poetry config virtualenvs.create false; \
     eatmydata poetry install; \
@@ -48,7 +48,8 @@ RUN set -e; \
 
 # Build messages and assets
 RUN eatmydata python manage.py compilemessages && \
-    eatmydata python manage.py yarn install \
+    eatmydata python manage.py yarn install && \
+    eatmydata python manage.py collectstatic --no-input --clear
 
 # Clean up build dependencies
 RUN set -e; \
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index bd6cc310bd05dbea6aaff274883f9cba985eaed2..bb5eca2a1b901797ef2cbaa7f4d4ff2670ef9811 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -17,7 +17,6 @@ while ! nc -z $ALEKSIS_database__host $ALEKSIS_database__port; do
     sleep 0.1
 done
 
-python manage.py collectstatic --no-input --clear
 python manage.py migrate
 
 if [[ -n "$@" ]]; then
diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf
index 1264dfb7ebb06410f63aa23329c76c7fe13394db..49c1f9a7573fc5e5cf60c85dc6b5d87cc3744e2f 100644
--- a/docker/nginx/nginx.conf
+++ b/docker/nginx/nginx.conf
@@ -15,8 +15,4 @@ server {
     location /media/ {
         alias /var/lib/aleksis/media/;
     }
-
-    location /static/ {
-        alias /var/lib/aleksis/static/;
-    }
 }