diff --git a/Dockerfile b/Dockerfile
index 4456128..5282a7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN mkdir -p /usr/src/app/media /usr/src/app/static
 RUN chown -R www-data:www-data /usr/src/app/media /usr/src/app/static
 
 
-COPY settings /usr/src/app
+COPY settings /usr/src/app/settings
 COPY dashboard.py /usr/src/app
 COPY manage.py /usr/src/app
 COPY urls.py /usr/src/app
@@ -45,7 +45,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
 ENV DJANGO_SETTINGS_MODULE=settings.production_docker_postgres_settings
 
 # Collect static files
-RUN python manage.py collectstatic --no-input --settings=settings.production_docker_postgres_settings
+RUN python manage.py collectstatic --no-input
 
 # Copy the Nginx configuration file
 COPY nginx.conf /etc/nginx/sites-enabled/default
diff --git a/docker-compose.yml b/docker-compose.yml
index 41e4ca9..2162706 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,8 +11,6 @@ services:
 
   web:
     image: ghcr.io/koalixswitzerland/koalixcrm-prod-container:main
-    volumes:
-      - .:/usr/src/app/
     ports:
       - "8000:8000"
     environment:
diff --git a/settings/base_settings.py b/settings/base_settings.py
index 590b941..bc7bfdc 100644
--- a/settings/base_settings.py
+++ b/settings/base_settings.py
@@ -91,10 +91,10 @@
 USE_TZ = True
 
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATIC_ROOT = os.path.join(BASE_DIR, '../static')
 
 MEDIA_URL = "/media/"
-MEDIA_ROOT = os.path.join(BASE_DIR)
+MEDIA_ROOT = os.path.join(BASE_DIR, '../media')
 
 PROJECT_ROOT = BASE_DIR