diff --git a/docker-compose.yml b/docker-compose.yml
index a073bb4ee..cd899e6c4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,3 @@
-server:
-  image: nginx:latest
-  ports:
-    - "80:80"
-  volumes:
-    - ./config/nginx:/etc/nginx/conf.d
-    - ./collected_static:/var/interlegis/sapl/collected_static
-    - ./media:/var/interlegis/sapl/media
-  volumes_from:
-    - web
 sapldb:
   image: postgres
   environment:
@@ -16,16 +6,15 @@ sapldb:
     POSTGRES_DB: sapl
     PGDATA : /var/lib/postgresql/data/
   volumes:
-    - ./postgres-data/data/:/var/lib/postgresql/data/
-    - ./data:/data-import
+    - sapldb_data:/var/lib/postgresql/data/
   ports:
     - "5532:5432"
-web:
+sapl:
   build: .
   volumes:
-    - .:/var/interlegis/sapl/
-    - ./data:/var/interlegis/sapl/data
-    - ./media:/var/interlegis/sapl/media
-    - ./collected_static:/var/interlegis/sapl/collected_static
+    - sapl_data:/var/interlegis/sapl/data
+    - sapl_media:/var/interlegis/sapl/media
   links:
     - sapldb
+  ports:
+    - "80:80"