diff --git a/templates/admin-openrc.sh.j2 b/templates/admin-openrc.sh.j2
index 260f035..8baeebf 100644
--- a/templates/admin-openrc.sh.j2
+++ b/templates/admin-openrc.sh.j2
@@ -1,5 +1,5 @@
 export OS_USERNAME=admin
 export OS_PASSWORD={{ keystone_password.stdout }}
 export OS_TENANT_NAME=admin
-export OS_AUTH_URL=https://{{ keystone_ip.stdout }}:5000/v2.0
+export OS_AUTH_URL=http://{{ keystone_ip.stdout }}:5000/v2.0
 export OS_REGION_NAME=RegionOne
diff --git a/templates/etc/ansible/hosts.j2 b/templates/etc/ansible/hosts.j2
index 742a35a..007b456 100644
--- a/templates/etc/ansible/hosts.j2
+++ b/templates/etc/ansible/hosts.j2
@@ -8,7 +8,8 @@
 keystone
 glance
 nova-cloud-controller
-quantum-gateway
+neutron-gateway
 openstack-dashboard
 ceilometer
 nagios
+neutron-api
diff --git a/templates/etc/hosts.j2 b/templates/etc/hosts.j2
index f153b6e..b095c5c 100644
--- a/templates/etc/hosts.j2
+++ b/templates/etc/hosts.j2
@@ -6,10 +6,11 @@
 {{ keystone_ip.stdout }} keystone
 {{ glance_ip.stdout }} glance
 {{ novacc_ip.stdout }} nova-cloud-controller
-{{ quantum_ip.stdout }} quantum-gateway
+{{ neutron_ip.stdout }} neutron-gateway
 {{ horizon_ip.stdout }} openstack-dashboard
 {{ ceilometer_ip.stdout }} ceilometer
 {{ nagios_ip.stdout }} nagios
+{{ neutron_api_ip.stdout}} neutron-api
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     localhost ip6-localhost ip6-loopback