diff --git a/docker-compose.yml b/docker-compose.yml
index 5ce48bd..2da6a31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,16 +22,16 @@ services:
     ports:
       - "127.0.0.1:6379:6379"
 
-  backend:
+  backend:
     build:
       context: ./backend/qlockify-backend-deployment
       dockerfile: ../Dockerfile
     restart: always
-    env_file:
-      - ./backend/qlockify-backend-deployment/.env
-    volumes:
-      - static_data:/app/staticfiles
-      - media_data:/app/mediafiles
+    env_file:
+      - ./backend/qlockify-backend-deployment/.env
+    volumes:
+      - static_data:/app/static
+      - media_data:/app/media
     command: >
       sh -c "python manage.py migrate &&
       python manage.py collectstatic --noinput &&
@@ -44,15 +44,15 @@ services:
       redis:
         condition: service_started
 
-  celery:
+  celery:
     build:
       context: ./backend/qlockify-backend-deployment
       dockerfile: ../Dockerfile
     restart: always
-    env_file:
-      - ./backend/qlockify-backend-deployment/.env
-    volumes:
-      - media_data:/app/mediafiles
+    env_file:
+      - ./backend/qlockify-backend-deployment/.env
+    volumes:
+      - media_data:/app/media
     command: celery -A config worker -l INFO
     depends_on:
       db:
@@ -82,8 +82,8 @@ services:
       - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro
       - ./nginx/certs:/etc/nginx/certs:ro
       - ./nginx/.htpasswd:/etc/nginx/.htpasswd:ro
-      - static_data:/usr/share/nginx/html/staticfiles:ro
-      - media_data:/usr/share/nginx/html/mediafiles:ro
+      - static_data:/usr/share/nginx/html/static:ro
+      - media_data:/usr/share/nginx/html/media:ro
     depends_on:
       - backend
       - frontend
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index b22705d..0a922b1 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -37,13 +37,13 @@ server {
 
     # Static and Media files
     location /static/ {
-        alias /usr/share/nginx/html/staticfiles/;
+        alias /usr/share/nginx/html/static/;
         expires 30d;
         access_log off;
     }
 
     location /media/ {
-        alias /usr/share/nginx/html/mediafiles/;
+        alias /usr/share/nginx/html/media/;
         expires 30d;
         access_log off;
     }