diff --git a/config/default-docker.json b/config/default-docker.json
index 3db818c..c2a7666 100644
--- a/config/default-docker.json
+++ b/config/default-docker.json
@@ -1,4 +1,5 @@
 {
+  "baseURL": "http://api.127.0.0.1.xip.io:3030",
   "mongodb": "mongodb://mongo:27017/hc_api",
   "host": "0.0.0.0"
 }
diff --git a/config/local-staging-docker.json b/config/local-staging-docker.json
index 3c81e30..c4902bf 100644
--- a/config/local-staging-docker.json
+++ b/config/local-staging-docker.json
@@ -1,8 +1,7 @@
 {
-  "baseURL": "http://172.25.0.11:3030",
   "seeder": {
     "runOnInit": true,
-    "dropDatabase": true
+    "dropDatabase": false
   },
   "smtpConfig": {
     "host": "maildev",
@@ -10,7 +9,7 @@
     "ignoreTLS": true
   },
   "thumbor": {
-    "url": "http://localhost:8000",
+    "url": "http://thumbor.127.0.0.1.xip.io:8000",
     "key": ""
   }
 }
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index d128314..06387fa 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.5'
 
 services:
   api:
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index 52222f2..04816f7 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -1,8 +1,8 @@
-version: '3'
+version: '3.5'
 
 services:
   api:
-    image: humanconnection/api-feathers
+    image: humanconnection/api-feathers:edge
     build:
       context: .
     environment:
@@ -13,12 +13,8 @@ services:
     ports:
       - "3030:3030"
     networks:
-      hc-network:
-        ipv4_address: 172.25.0.11
-  thumbor:
-    networks:
-      hc-network:
-        ipv4_address: 172.25.0.13
+      - hc-network
+
   maildev:
     image: djfarrelly/maildev
     networks:
@@ -26,18 +22,11 @@ services:
     ports:
       - "1080:80"
       - "1025:25"
+
   thumbor:
+    container_name: thumbor.127.0.0.1.xip.io
     image: apsl/thumbor
     networks:
       - hc-network
     ports:
       - "8000:8000"
-
-networks:
-  hc-network:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-      -
-        subnet: 172.25.0.0/16
diff --git a/docker-compose.yml b/docker-compose.yml
index d928c5a..6f656bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,32 @@
-version: '3'
+version: '3.5'
 
 services:
   api:
+    container_name: api.127.0.0.1.xip.io
     build: .
     depends_on:
       - mongo
     networks:
       - hc-network
+
   mongo:
     image: mongo
     networks:
       - hc-network
     command: "--smallfiles --logpath=/dev/null"
 
+    #  dns-proxy-server:
+    #    image: defreitas/dns-proxy-server
+    #    volumes:
+    #      - "/var/run/docker.sock:/var/run/docker.sock"
+    #      - "/etc/resolv.conf:/etc/resolv.conf"
+    #      - "./dns-proxy-server.config.json:/app/conf/config.json"
+    #    ports:
+    #      - 5380:5380
+    #    hostname: dns.mageddo
+    #    networks:
+    #      - hc-network
+
 networks:
   hc-network:
+    name: hc-network