diff --git a/docker-compose.yml b/docker-compose.yml
index 9a8c9ad..c45fee3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,12 +5,13 @@ x-logging: &default-logging
         tag: "{{.Name}}"
 
 x-utility: &default-utility
-    image: "alpine:3.11"
+    image: alpine:3.11
     logging: *default-logging
     network_mode: host
 
 services:
         tor:
+                container_name: tor
                 image: getumbrel/tor:v0.4.1.9
                 restart: on-failure
                 logging: *default-logging
@@ -22,8 +23,8 @@ services:
                     net:
                         ipv4_address: 10.11.5.1
         nginx:
+                container_name: nginx
                 image: nginx:1.17.8
-                depends_on: [ tor ]
                 logging: *default-logging
                 volumes:
                         - ${PWD}/nginx:/etc/nginx
@@ -35,9 +36,10 @@ services:
                     net:
                         ipv4_address: 10.11.0.2
         bitcoin:
+                container_name: bitcoin
                 image: lncm/bitcoind:v0.20.0
-                depends_on: [ tor ]
                 logging: *default-logging
+                depends_on: [ tor ]
                 command: "-zmqpubrawblock=tcp://0.0.0.0:28332 -zmqpubrawtx=tcp://0.0.0.0:28333"
                 volumes:
                         - ${PWD}/bitcoin:/root/.bitcoin
@@ -51,9 +53,10 @@ services:
                     net:
                         ipv4_address: 10.11.1.1
         lnd:
+                container_name: lnd
                 image: lncm/lnd:v0.10.1-experimental
-                depends_on: [ tor ]
                 logging: *default-logging
+                depends_on: [ tor ]
                 volumes:
                         - ${PWD}/lnd:/data/.lnd
                         - ${PWD}/lnd:/root/.lnd
@@ -64,8 +67,8 @@ services:
                     net:
                         ipv4_address: 10.11.1.2
         dashboard:
+                container_name: dashboard
                 image: getumbrel/dashboard:v0.2.1
-                depends_on: [ bitcoin, lnd, nginx ]
                 logging: *default-logging
                 restart: always
                 stop_grace_period: 1m30s
@@ -73,9 +76,10 @@ services:
                     net:
                         ipv4_address: 10.11.0.3
         manager:
+                container_name: manager
                 image: getumbrel/manager:v0.1.1
-                depends_on: [ bitcoin, lnd, nginx ]
                 logging: *default-logging
+                depends_on: [ tor ]
                 restart: unless-stopped
                 stop_grace_period: 5m30s
                 volumes:
@@ -96,10 +100,11 @@ services:
                     net:
                         ipv4_address: 10.11.2.1
         middleware:
+                container_name: middleware
                 image: getumbrel/middleware:v0.1.1
-                depends_on: [ bitcoin, lnd, nginx ]
-                command: ["./wait-for-node-manager.sh", "10.11.2.1", "npm", "start"]
                 logging: *default-logging
+                depends_on: [ manager, bitcoin, lnd ]
+                command: ["./wait-for-node-manager.sh", "10.11.2.1", "npm", "start"]
                 restart: unless-stopped
                 depends_on: [ manager ]
                 volumes: