diff --git a/roles/common/defaults/main.yaml b/roles/common/defaults/main.yaml
index a7f01bc..3898fb8 100644
--- a/roles/common/defaults/main.yaml
+++ b/roles/common/defaults/main.yaml
@@ -1,6 +1,8 @@
 ---
-conductor_server: http://conductor-server:8080/api
-target_path: "/tmp/conductor_stack"
+conductor_service: "conductor-server-{{ infrastructure }}"
+conductor_ui_service: "conductor-ui-{{ infrastructure }}"
+conductor_service_url: "http://{{ conductor_service }}:8080/api"
+target_path: "/tmp/conductor_stack_{{ infrastructure }}"
 conductor_network: conductor-network
 conductor_db: postgres
 init_db: True
diff --git a/roles/conductor/templates/conductor-swarm.yaml.j2 b/roles/conductor/templates/conductor-swarm.yaml.j2
index 3dda063..9b060fb 100644
--- a/roles/conductor/templates/conductor-swarm.yaml.j2
+++ b/roles/conductor/templates/conductor-swarm.yaml.j2
@@ -3,7 +3,7 @@ version: '3.6'
 {% set clustered = (cluster_replacement is defined and cluster_replacement) or (cluster_check is defined and cluster_check) %}
 
 services:
-  conductor-server:
+  {{ conductor_service }}:
     environment:
       - CONFIG_PROP={{ conductor_config }}
     image: "{{ conductor_image }}"
@@ -27,9 +27,9 @@ services:
     logging:
       driver: "journald"
 
-  conductor-ui:
+  {{ conductor_ui_service }}:
     environment:
-      - WF_SERVER=http://conductor-server:8080/api/
+      - WF_SERVER="{{ conductor_service_url }}"
       - AUTH_CONFIG_PATH=/app/config/auth.config
     image: "{{ conductor_ui_image }}"
     networks:
diff --git a/roles/pep/defaults/main.yaml b/roles/pep/defaults/main.yaml
index 8f03bc6..37b58c0 100644
--- a/roles/pep/defaults/main.yaml
+++ b/roles/pep/defaults/main.yaml
@@ -1,6 +1,4 @@
 pep_port: 80
 pep_replicas: 1
 # hostnames to be used as vhosts
-conductor_server_name: conductor-server
-conductor_ui_server_name: conductor-ui
 #pep_credentials: in vault
diff --git a/roles/pep/templates/nginx.default.conf.j2 b/roles/pep/templates/nginx.default.conf.j2
index 659352d..9a6ed51 100644
--- a/roles/pep/templates/nginx.default.conf.j2
+++ b/roles/pep/templates/nginx.default.conf.j2
@@ -1,11 +1,11 @@
 upstream _conductor-server {
   ip_hash;
-  server conductor-server:8080;
+  server {{ conductor_service }}:8080;
 }
 
 upstream _conductor-ui {
   ip_hash;
-  server conductor-ui:5000;
+  server {{ conductor_ui_service }}:5000;
 }
 
 map $http_authorization $source_auth {
diff --git a/roles/pep/templates/nginx.default.conf.nopep.j2 b/roles/pep/templates/nginx.default.conf.nopep.j2
index 59396a4..31f0208 100644
--- a/roles/pep/templates/nginx.default.conf.nopep.j2
+++ b/roles/pep/templates/nginx.default.conf.nopep.j2
@@ -1,11 +1,11 @@
 upstream _conductor-server {
   ip_hash;
-  server conductor-server:8080;
+  server {{ conductor_service }}:8080;
 }
 
 upstream _conductor-ui {
   ip_hash;
-  server conductor-ui:5000;
+  server {{ conductor_ui_service}}:5000;
 }
 
 server {
diff --git a/roles/pep/templates/pep-swarm-ha_network.yaml.j2 b/roles/pep/templates/pep-swarm-ha_network.yaml.j2
index 8948f12..85986ed 100644
--- a/roles/pep/templates/pep-swarm-ha_network.yaml.j2
+++ b/roles/pep/templates/pep-swarm-ha_network.yaml.j2
@@ -5,7 +5,7 @@ services:
   pep:
     image: nginx:stable-alpine
     networks:
-      - conductor-network
+      - {{ conductor_network }}
       - haproxy-public 
     deploy:
       replicas: 1
@@ -29,7 +29,7 @@ services:
 {% endif %}
 
 networks:
-  conductor-network:
+  {{ conductor_network }}:
   haproxy-public:
     external: true
 configs:
diff --git a/roles/pep/templates/pep-swarm.yaml.j2 b/roles/pep/templates/pep-swarm.yaml.j2
index d82c987..478d4a5 100644
--- a/roles/pep/templates/pep-swarm.yaml.j2
+++ b/roles/pep/templates/pep-swarm.yaml.j2
@@ -5,7 +5,7 @@ services:
   pep:
     image: nginx:stable-alpine
     networks:
-      - conductor-network
+      - {{ conductor_network }}
     ports:
       - "{{ pep_port }}:80"
     deploy:
@@ -31,7 +31,7 @@ services:
 {% endif %}
 
 networks:
-  conductor-network:
+  {{ conductor_network }}:
 
 configs:
   nginxconf:
diff --git a/roles/workers/defaults/main.yaml b/roles/workers/defaults/main.yaml
index cdd0835..42cf29c 100644
--- a/roles/workers/defaults/main.yaml
+++ b/roles/workers/defaults/main.yaml
@@ -1,5 +1,5 @@
 ---
-conductor_workers_server: http://conductor-server:8080/api
+conductor_workers_server: "{{ conductor_service_url }}" 
 
 conductor_workers: [ { service: 'base', image: 'nubisware/nubisware-conductor-worker-py-base', replicas: 2, threads: 1, pollrate: 1 }] 
 
diff --git a/site-dev.yaml b/site-dev.yaml
index b0da54e..8927665 100644
--- a/site-dev.yaml
+++ b/site-dev.yaml
@@ -1,5 +1,6 @@
 ---
 - hosts: dev_infra  
+#- hosts: localhost
   vars_files:
     - roles/workers/defaults/smtp.yaml
     - roles/pep/defaults/pep_credentials.yaml
diff --git a/site-nw-cluster.yaml b/site-nw-cluster.yaml
index ed229c5..5a5a2bc 100644
--- a/site-nw-cluster.yaml
+++ b/site-nw-cluster.yaml
@@ -1,5 +1,6 @@
 ---
 - hosts: nw_cluster_infra  
+#- hosts: localhost
   vars_files:
     - roles/workers/defaults/smtp.yaml
     - roles/pep/defaults/pep_credentials.yaml
diff --git a/site-pre.yaml b/site-pre.yaml
index 351cc2a..1897ec1 100644
--- a/site-pre.yaml
+++ b/site-pre.yaml
@@ -1,5 +1,6 @@
 ---
-- hosts: pre_infra  
+#- hosts: pre_infra  
+- hosts: localhost
   vars_files:
     - roles/workers/defaults/smtp.yaml
     - roles/pep/defaults/pep_credentials.yaml