diff --git a/Dockerfile b/Dockerfile
index 4fab184f..976d86cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,7 +57,7 @@ RUN apt-get update -y && \
     && rm -rf /var/lib/apt/lists/*
 
 # Set up virtualenv
-RUN mkdir -p /home/mediacms.io/mediacms/{logs,media_files,static_files} && \
+RUN mkdir -p /home/mediacms.io/mediacms/{logs,media_files,static} && \
     cd /home/mediacms.io && \
     python3 -m venv $VIRTUAL_ENV
 
@@ -105,7 +105,7 @@ RUN if [ -f config/local_settings.py ]; then \
 RUN mkdir -p /var/run/mediacms && \
     chown -R www-data:www-data /home/mediacms.io/mediacms/logs \
                                 /home/mediacms.io/mediacms/media_files \
-                                /home/mediacms.io/mediacms/static_files \
+                                /home/mediacms.io/mediacms/static \
                                 /var/run/mediacms
 
 # Copy and set up entrypoint script
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1c3102b2..01195456 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -15,7 +15,7 @@ services:
       db:
         condition: service_healthy
     volumes:
-      - static_files:/home/mediacms.io/mediacms/static_files
+      - static_files:/home/mediacms.io/mediacms/static
       - media_files:/home/mediacms.io/mediacms/media_files
       - logs:/home/mediacms.io/mediacms/logs
 
@@ -32,7 +32,7 @@ services:
       db:
         condition: service_healthy
     volumes:
-      - static_files:/home/mediacms.io/mediacms/static_files
+      - static_files:/home/mediacms.io/mediacms/static
       - media_files:/home/mediacms.io/mediacms/media_files
       - logs:/home/mediacms.io/mediacms/logs
 
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index db311320..fd2d4ed2 100644
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -5,7 +5,7 @@ set -e
 chown -R www-data:www-data \
     /home/mediacms.io/mediacms/logs \
     /home/mediacms.io/mediacms/media_files \
-    /home/mediacms.io/mediacms/static_files \
+    /home/mediacms.io/mediacms/static \
     2>/dev/null || true
 
 # Run as www-data user