diff --git a/README.md b/README.md
index 58c4e2d..a6d3c2f 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ if you do this.
 ## Running
 ```sh
 $ docker-compose pull
-$ docker-compose --x-networking up -d
+$ docker-compose up -d
 ```
 Make sure you install the dependencies and finish configuration before doing
 this.
@@ -33,7 +33,7 @@ You may optionally build the images yourself instead of pulling by running
 
 ## Dependencies
 - [Docker](https://github.com/docker/docker)
-- [Docker Compose](https://github.com/docker/compose)
+- [Docker Compose](https://github.com/docker/compose) >=v1.6.0
 
 ## Configuration
 Copy the `config.default` file to `config` and change the variables as desired.
diff --git a/docker-compose.yml b/docker-compose.yml
index 3368b46..b4d4572 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,64 +1,82 @@
-frontend:
-    image: kelvinchen/seedbox:frontend
-    restart: always
-    net: seedbox
-    ports:
-        - "80:80"
-        - "443:443"
-    volumes:
-        - seedbox_config:/config
-    env_file:
-        - config
+version: '2'
 
-rtorrent:
-    image: kelvinchen/seedbox:rtorrent
-    restart: always
-    net: seedbox
-    ports:
-        - "49161:49161"
-        - "49161:49161/udp"
-        - "6881:6881/udp"
-    volumes:
-        - seedbox_config:/config
-        - seedbox_torrents:/torrents
+networks:
+    main:
 
-plex:
-    image: kelvinchen/seedbox:plex
-    restart: always
-    net: seedbox
-    ports:
-        - "32400:32400"
-    volumes:
-        - seedbox_config:/config
-        - seedbox_torrents:/torrents
+volumes:
+    config:
+        driver: local
+    torrents:
+        driver: local
 
-sickrage:
-    image: kelvinchen/seedbox:sickrage
-    restart: always
-    net: seedbox
-    volumes:
-        - seedbox_config:/config
-        - seedbox_torrents:/torrents
+services:
+    frontend:
+        image: kelvinchen/seedbox:frontend
+        restart: always
+        networks:
+            - main
+        ports:
+            - "80:80"
+            - "443:443"
+        volumes:
+            - config:/config
+        env_file:
+            - config
 
-syncthing:
-    image: kelvinchen/seedbox:syncthing
-    restart: always
-    net: seedbox
-    ports:
-        - "22000:22000"
-        - "21027:21027/udp"
-    volumes:
-        - seedbox_config:/config
-        - seedbox_torrents:/torrents
+    rtorrent:
+        image: kelvinchen/seedbox:rtorrent
+        restart: always
+        networks:
+            - main
+        ports:
+            - "49161:49161"
+            - "49161:49161/udp"
+            - "6881:6881/udp"
+        volumes:
+            - config:/config
+            - torrents:/torrents
 
-openvpn:
-    image: kelvinchen/seedbox:openvpn
-    restart: always
-    net: seedbox
-    ports:
-        - "1194:1194/udp"
-    volumes:
-        - seedbox_config:/config
-        - seedbox_torrents:/torrents
-    cap_add:
-        - NET_ADMIN
+    plex:
+        image: kelvinchen/seedbox:plex
+        restart: always
+        networks:
+            - main
+        ports:
+            - "32400:32400"
+        volumes:
+            - config:/config
+            - torrents:/torrents
+
+    sickrage:
+        image: kelvinchen/seedbox:sickrage
+        restart: always
+        networks:
+            - main
+        volumes:
+            - config:/config
+            - torrents:/torrents
+
+    syncthing:
+        image: kelvinchen/seedbox:syncthing
+        restart: always
+        networks:
+            - main
+        ports:
+            - "22000:22000"
+            - "21027:21027/udp"
+        volumes:
+            - config:/config
+            - torrents:/torrents
+
+    openvpn:
+        image: kelvinchen/seedbox:openvpn
+        restart: always
+        networks:
+            - main
+        ports:
+            - "1194:1194/udp"
+        volumes:
+            - config:/config
+            - torrents:/torrents
+        cap_add:
+            - NET_ADMIN