diff --git a/Dockerfile b/Dockerfile
index fb54a4503f44ef2db91c15e9afb7357683543e51..1f756dfc9c0884e372158253fb6acf692f152245 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,7 +61,9 @@ CMD ["/usr/local/bin/aleksis-docker-startup"]
 
 # Install assets
 FROM core as assets
-RUN eatmydata aleksis-admin yarn install
+RUN eatmydata aleksis-admin yarn install; \
+    eatmydata aleksis-admin collectstatic; \
+    rm -rf /usr/local/share/.cache
 
 # Clean up build dependencies
 FROM assets AS clean
diff --git a/docker-startup.sh b/docker-startup.sh
index 98705fb16b38d6ad1f4012e25ea4e5768782eb4d..b73e6a7104ecef5ec91c647c71d130097afd5a7b 100755
--- a/docker-startup.sh
+++ b/docker-startup.sh
@@ -46,12 +46,6 @@ wait_database() {
 	echo
 }
 
-prepare_static() {
-	# Prepare static files; should only be run in app container or job
-	aleksis-admin compilescss
-	aleksis-admin collectstatic --no-input --clear
-}
-
 prepare_database() {
 	# Migrate database; should only be run in app container or job
 	aleksis-admin migrate
@@ -79,7 +73,6 @@ uwsgi)
 	if [ $PREPARE = 1 ]; then
 		# Responsible for running migratiosn and preparing staticfiles
 		prepare_database
-		prepare_static
 	else
 		# Wait for migrations to be applied elsewhere
 		wait_migrations
@@ -103,7 +96,6 @@ celery-*)
 prepare)
 	# Preparation only mode
 	prepare_database
-	prepare_static
 	;;
 *)
 	# Run arguments as command verbatim