diff --git a/Project/Orchestration/docker-compose-default.yml b/Project/Orchestration/docker-compose-default.yml
index e7b927990..6ae7b4186 100644
--- a/Project/Orchestration/docker-compose-default.yml
+++ b/Project/Orchestration/docker-compose-default.yml
@@ -6,7 +6,7 @@ services:
       context: ../python
     image: 311-data-back:0.0.1
     restart: always
-    network_mode: host
+    container_name: "311-backend"
     environment:
       SODAPY_APPTOKEN: <Your Token Here>
     ports:
@@ -20,22 +20,27 @@ services:
       - '../javascript/react/311-data:/app'
       - '/app/node_modules'
     restart: always
+    container_name: "311-frontend"
     ports:
       - 3000:3000
 
   db:
     image: postgres
     restart: always
-    volumes:
-      - '/var/run/postgresql:/var/run/postgresql'
+    container_name: "311-postgres"
     environment:
       POSTGRES_PASSWORD: REDACTED
       POSTGRES_USER: REDACTED
     ports:
       - 5432:5432
+    volumes:
+      - backend_data:/var/lib/postgresql/data
 
   adminer:
     image: adminer
     restart: always
+    container_name: "postgres-dashboard"
     ports:
       - 8080:8080
+volumes:
+  backend_data:
diff --git a/Project/python/src/config-default.cfg b/Project/python/src/config-default.cfg
index c7694d0b6..5de84a24d 100644
--- a/Project/python/src/config-default.cfg
+++ b/Project/python/src/config-default.cfg
@@ -1,8 +1,8 @@
 DEFAULT_DB_PROVIDER = "postgres"
-DB_CONNECTION_STRING = "postgresql://REDACTED:REDACTED@localhost:5432/311-user"
+DB_CONNECTION_STRING = "postgresql://REDACTED:REDACTED@311-postgres:5432/311-user"
 DATA_DOMAIN = "data.lacity.org"
 SODAPY_APPTOKEN = None
 DEBUG = True
 HOST = "0.0.0.0"
 PORT = "5000"
-FRONTEND_SERVER = "http://localhost:3000"
+FRONTEND_SERVER = "http://311-postgres:3000"