diff --git a/castellum_core/Dockerfile b/castellum_core/Dockerfile
index 7d8f00513d978e4b8b2982a25ba41ca3d169b275..932314e67361f561adc84d3b37a64658d896c5e2 100644
--- a/castellum_core/Dockerfile
+++ b/castellum_core/Dockerfile
@@ -12,3 +12,5 @@ RUN pip3 install -e .
 RUN npm install
 
 RUN apk del $BUILDPKGS
+
+RUN python3 castellum_core/manage.py collectstatic --no-input
diff --git a/docker-compose.yml b/docker-compose.yml
index 5acb24b00fed2e96a1f368fa547e72e684fa6896..846d262a9bef3e7b695e35997666bf822d991d15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,6 @@ services:
       sh -c "
       python3 castellum_core/manage.py migrate &&
       python3 castellum_core/manage.py shell -c \"from castellum_auth.models import User; User.objects.filter(username='admin') or User.objects.create_superuser('admin', 'admin@example.com', '123')\" &&
-      python3 castellum_core/manage.py collectstatic --no-input &&
       uwsgi uwsgi.ini"
     volumes:
       - static-content:/code/castellum_core/collectstatic