diff --git a/Dockerfile b/Dockerfile
index ec6f771d02496a26629df0f0959af7ff7cbf69c3..6170a24a39558bcf7b9e49ff96d5ee7f6a71ceb6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,8 +42,7 @@ RUN mkdir -p /var/lib/biscuit/media /var/lib/biscuit/static /var/lib/biscuit/bac
 
 # Build messages and assets
 RUN python manage.py compilemessages; \
-    python manage.py yarn install; \
-    python manage.py collectstatic --no-input --clear
+    python manage.py yarn install
 
 # Clean up build dependencies
 RUN apt-get remove --purge -y \
@@ -57,7 +56,6 @@ RUN apt-get remove --purge -y \
     pip uninstall -y poetry; \
     rm -f /var/lib/apt/lists/*_*; \
     rm -rf /root/.cache; \
-    rm -rf biscuit/node_modules; \
     rm -rf /usr/local/lib/node_modules
 
 # Declare a persistent volume for all data
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 4dcf89fce710430ead493366a36f26863dffcd69..eb1668a08a600197c2abb0b20813e8aff433b9cf 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -19,6 +19,7 @@ done
 
 python manage.py flush --no-input
 python manage.py migrate
+python manage.py collectstatic --no-input --clear
 
 if [[ -n "$@" ]]; then
     exec "$@"