diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 98be27d..fec0142 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,19 +1,7 @@
 version: '3.4'
 
 services:
-  web:
-    image: nginx
-    volumes:
-       - ./config/proxy:/etc/nginx/conf.d
-       - ./config/proxy/web.conf:/etc/nginx/nginx.conf:ro
-    links:
-      - identifier:identifier
-    labels:
-      - "logging=true"
-    restart: always
-    ports:
-      - "80:80"
-  identifier:
+  identifier:    
     restart: "no"
   dispatcher:
     restart: "no"
@@ -47,21 +35,9 @@ services:
     restart: "no"
   login:
     restart: "no"
-  frontend:
-    image: lblod/frontend-contact-hub:latest
-    labels:
-      - "logging=true"
-    restart: always
-    environment: 
-     EMBER_OAUTH_API_REDIRECT_URL: "https://organisaties.abb.lblod.info/authorization/callback"
-     EMBER_OAUTH_API_KEY: "677af572-2e2f-4e61-ad38-036723bb314c"
-     EMBER_OAUTH_API_BASE_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/auth"
-     EMBER_OAUTH_API_LOGOUT_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/logout"
-     EMBER_OAUTH_API_SCOPE: "openid vo profile abb_organisatieportaal"
-    restart: always
-  proxy:
-    image: nginx:1.13
-    volumes:
-      - ./config/proxy-https:/etc/nginx/conf.d
+  web:
     ports:
-      - "443:443"
\ No newline at end of file
+      - "80:80"
+    restart: "no"
+  frontend:
+    restart: "no"
\ No newline at end of file
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
deleted file mode 100644
index a5cf203..0000000
--- a/docker-compose.prod.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-version: '3.4'
-
-x-logging:
-  &default-logging
-  driver: "json-file"
-  options:
-    max-size: "10m"
-    max-file: "3"
-
-services:
-  web:
-    image: nginx
-    volumes:
-       - ./config/proxy:/etc/nginx/conf.d
-       - ./config/proxy/web.conf:/etc/nginx/nginx.conf:ro
-    links:
-      - identifier:identifier
-    labels:
-      - "logging=true"
-    restart: always
-    logging: *default-logging
-  frontend:
-    image: lblod/frontend-contact-hub:1.0.0
-    labels:
-      - "logging=true"
-    environment: 
-     EMBER_OAUTH_API_REDIRECT_URL: "https://organisaties.abb.lblod.info/authorization/callback"
-     EMBER_OAUTH_API_KEY: "677af572-2e2f-4e61-ad38-036723bb314c"
-     EMBER_OAUTH_API_BASE_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/auth"
-     EMBER_OAUTH_API_LOGOUT_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/logout"
-     EMBER_OAUTH_API_SCOPE: "openid vo profile abb_organisatieportaal"
-    restart: always
diff --git a/docker-compose.yml b/docker-compose.yml
index 35d6832..16f3e4a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -75,7 +75,6 @@ services:
       - "logging=true"
     restart: always
     logging: *default-logging
-  # Ember-Metis
   uri-info:
     image: redpencil/mu-uri-info-service:0.2.1
     links:
@@ -146,4 +145,26 @@ services:
       DEFAULT_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
       SESSION_GRAPH: "http://mu.semte.ch/graphs/sessions"
   adressenregister:
-    image: lblod/adressenregister-fuzzy-search-service:0.5.0
\ No newline at end of file
+    image: lblod/adressenregister-fuzzy-search-service:0.5.0
+  web:
+    image: nginx
+    volumes:
+       - ./config/proxy:/etc/nginx/conf.d
+       - ./config/proxy/web.conf:/etc/nginx/nginx.conf:ro
+    links:
+      - identifier:identifier
+    labels:
+      - "logging=true"
+    restart: always
+    logging: *default-logging
+  frontend:
+    image: lblod/frontend-contact-hub:1.0.0
+    labels:
+      - "logging=true"
+    environment:
+      EMBER_OAUTH_API_REDIRECT_URL: "https://organisaties.abb.lblod.info/authorization/callback"
+      EMBER_OAUTH_API_KEY: "677af572-2e2f-4e61-ad38-036723bb314c"
+      EMBER_OAUTH_API_BASE_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/auth"
+      EMBER_OAUTH_API_LOGOUT_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/logout"
+      EMBER_OAUTH_API_SCOPE: "openid vo profile abb_organisatieportaal"
+    restart: always