diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index b62f61e4..e84113f1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,6 +9,7 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
     volumes:
+      - postgres_dir:/var/lib/postgresql/data
       - ../createdb.sql:/docker-entrypoint-initdb.d/init.sql
 
   btcd:
@@ -22,7 +23,6 @@ services:
       - bitcoin:/data
     environment:
       - NETWORK=testnet
-      - MINING_ADDRESS
     entrypoint: ["./start-btcd.sh"]
 
   lnd:
diff --git a/itests/docker-compose.yml b/itests/docker-compose.yml
index f6816f61..59b895d0 100644
--- a/itests/docker-compose.yml
+++ b/itests/docker-compose.yml
@@ -108,26 +108,6 @@ services:
       - "lnd_client:lnd"
     command: tail -f /dev/null
 
-  # envoy:
-  #   image: envoy
-  #   container_name: test_envoy
-  #   build:
-  #     context: ../
-  #     dockerfile: docker/envoy/Dockerfile
-  #   ports:
-  #     - 8080:8080
-  #   links:
-  #     - "sqkserver:sqkserver"
-
-  # frontend:
-  #   image: frontend
-  #   container_name: test_frontend
-  #   build:
-  #     context: ../
-  #     dockerfile: docker/frontend/Dockerfile
-  #   ports:
-  #     - 8081:8081
-
 volumes:
   # btcctl and lnd containers.
   test_shared: