diff --git a/templates/admin-openrc-cord.sh.j2 b/templates/admin-openrc-cord.sh.j2
index 913e86a..eb1c3df 100644
--- a/templates/admin-openrc-cord.sh.j2
+++ b/templates/admin-openrc-cord.sh.j2
@@ -1,5 +1,5 @@
 export OS_USERNAME=admin
 export OS_PASSWORD=ADMIN_PASS
 export OS_TENANT_NAME=admin
-export OS_AUTH_URL=http://{{ keystone_ip.stdout }}:5000/v2.0/
+export OS_AUTH_URL=http://keystone:5000/v2.0/
 export OS_REGION_NAME=RegionOne
diff --git a/templates/cord.yaml b/templates/cord.yaml
index 1efb0b0..0e1cb70 100644
--- a/templates/cord.yaml
+++ b/templates/cord.yaml
@@ -153,7 +153,7 @@
     num_units: 1
     options:
       neutron-plugin: onosvtn
-      onos-vtn-ip: {{ onos_cord_ip.stdout }}
+      onos-vtn-ip: onos-cord
       neutron-security-groups: true
       openstack-origin: cloud:trusty-kilo
       overlay-network-type: vxlan
diff --git a/templates/environments.yaml.j2 b/templates/environments.yaml.j2
index 710afa1..4daeba1 100644
--- a/templates/environments.yaml.j2
+++ b/templates/environments.yaml.j2
@@ -2,6 +2,6 @@
 environments:
     manual:
         type: manual
-        bootstrap-host: {{ juju_ip.stdout }}
+        bootstrap-host: juju
         bootstrap-user: ubuntu
         default-series: trusty