diff --git a/docker-compose.yml b/docker-compose.yml
index 2fc1a6ca64c1e19acd9983cdc1cb2acba450638f..1745e267a0dac6089587fb57ca150bcf3a96fe93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,31 +1,38 @@
-discovery:
-  image: jwilder/docker-gen
-  volumes:
-    - "/var/run/docker.sock:/tmp/docker.sock:ro"
-    - "./templates:/etc/docker-gen/templates"
-    - "./haproxy:/etc/haproxy"
-  command: "-watch /etc/docker-gen/templates/haproxy.cfg.tmpl /etc/haproxy/haproxy.cfg"
-haproxy:
-  image: indiehosters/haproxy
-  volumes:
-    - "./haproxy:/etc/haproxy"
-    - "/dev/log:/dev/log"
-  links:
-    - letsencrypt
-  ports:
-    - "80:80"
-    - "443:443"
-letsencrypt-web:
-  image: nginx
-  volumes:
-    - "./acme-challenge:/usr/share/nginx/html/.well-known/acme-challenge:ro"
-letsencrypt:
-  image: indiehosters/letsencrypt
-  volumes:
-    - "./haproxy:/etc/haproxy"
-    - "./acme-challenge:/html-root/.well-known/acme-challenge/"
-    - "./certs:/var/certs"
-ocsp:
-  image: indiehosters/ocsp
-  volumes:
-    - "./haproxy:/etc/haproxy"
+version: '2'
+
+networks:
+  web:
+    external: true
+
+services:
+  discovery:
+    image: jwilder/docker-gen
+    volumes:
+      - "/var/run/docker.sock:/tmp/docker.sock:ro"
+      - "./templates:/etc/docker-gen/templates"
+      - "./haproxy:/etc/haproxy"
+    command: "-watch /etc/docker-gen/templates/haproxy.cfg.tmpl /etc/haproxy/haproxy.cfg"
+  haproxy:
+    image: indiehosters/haproxy
+    volumes:
+      - "./haproxy:/etc/haproxy"
+      - "/dev/log:/dev/log"
+    links:
+      - letsencrypt
+    ports:
+      - "80:80"
+      - "443:443"
+  letsencrypt-web:
+    image: nginx
+    volumes:
+      - "./acme-challenge:/usr/share/nginx/html/.well-known/acme-challenge:ro"
+  letsencrypt:
+    image: indiehosters/letsencrypt
+    volumes:
+      - "./haproxy:/etc/haproxy"
+      - "./acme-challenge:/html-root/.well-known/acme-challenge/"
+      - "./certs:/var/certs"
+  ocsp:
+    image: indiehosters/ocsp
+    volumes:
+      - "./haproxy:/etc/haproxy"