diff --git a/common/Makefile b/common/Makefile
index 58dcb0c..68567e1 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -142,7 +142,7 @@
 	@echo "XOS Image Commit Hash: `sudo docker inspect -f '{{ .Config.Labels.XOS_GIT_COMMIT_HASH }}' xosproject/xos`"
 	@echo "XOS Image Commit Date: `sudo docker inspect -f '{{ .Config.Labels.XOS_GIT_COMMIT_DATE }}' xosproject/xos`"
 	sudo rm -f $(DOCKER_COMPOSE_YML)
-	sudo docker network create xos
+	sudo docker network inspect xos || sudo docker network create xos
 	sudo CONFIG_DIR=$(CONFIG_DIR) docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) up -d
 	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_BOOTSTRAP_PORT)
 	sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py none /opt/xos/bootstrap_tosca/fixtures.yaml
diff --git a/cord-pod/files/exampleservice_config b/cord-pod/files/exampleservice_config
index b537527..4022e09 100644
--- a/cord-pod/files/exampleservice_config
+++ b/cord-pod/files/exampleservice_config
@@ -3,7 +3,7 @@
 name=xos
 user=postgres
 password=password
-host=localhost
+host=xos_db
 port=5432
 
 # Required by XOS
diff --git a/cord-pod/files/monitoring_synchronizer_config b/cord-pod/files/monitoring_synchronizer_config
index 1ee96f0..cfd73a0 100644
--- a/cord-pod/files/monitoring_synchronizer_config
+++ b/cord-pod/files/monitoring_synchronizer_config
@@ -7,7 +7,7 @@
 name=xos
 user=postgres
 password=password
-host=localhost
+host=xos_db
 port=5432
 
 [api]
diff --git a/cord-pod/files/openstack_synchronizer_config b/cord-pod/files/openstack_synchronizer_config
index 74d68e3..3b7f8e9 100644
--- a/cord-pod/files/openstack_synchronizer_config
+++ b/cord-pod/files/openstack_synchronizer_config
@@ -2,7 +2,7 @@
 name=xos
 user=postgres
 password=password
-host=localhost
+host=xos_db
 port=5432
 
 [api]
diff --git a/cord-pod/files/vcpe_synchronizer_config b/cord-pod/files/vcpe_synchronizer_config
index a44c5f7..babe94f 100644
--- a/cord-pod/files/vcpe_synchronizer_config
+++ b/cord-pod/files/vcpe_synchronizer_config
@@ -7,7 +7,7 @@
 name=xos
 user=postgres
 password=password
-host=localhost
+host=xos_db
 port=5432
 
 [api]
diff --git a/cord-pod/files/vtr_synchronizer_config b/cord-pod/files/vtr_synchronizer_config
index 223ab00..3d3209c 100644
--- a/cord-pod/files/vtr_synchronizer_config
+++ b/cord-pod/files/vtr_synchronizer_config
@@ -7,7 +7,7 @@
 name=xos
 user=postgres
 password=password
-host=localhost
+host=xos_db
 port=5432
 
 [api]