diff --git a/defaults/main.yml b/defaults/main.yml
index b3f447a8..6129dc36 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -208,6 +208,7 @@ nova_image_cache_manager_interval: 0
 nova_resume_guests_state_on_host_boot: False
 nova_dhcp_domain: novalocal
 nova_default_schedule_zone: nova
+glance_api_servers: "{{ glance_host }}:{{ glance_service_port }}"
 
 # Nova quota
 nova_quota_cores: 20
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index c1270cf3..cdadb1e0 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -156,18 +156,13 @@ vncserver_proxyclient_address = {{ nova_novncproxy_vncserver_proxyclient_address
 
 # Glance
 [glance]
-{% if glance_api_servers is defined %}
 api_servers = {{ glance_api_servers }}
-{% else %}
-host = {{ glance_host }}
-port = {{ glance_service_port }}
-{% endif %}
 
 # Neutron
 [neutron]
 url = {{ neutron_service_adminurl }}
 region_name = {{ neutron_service_region }}
-auth_plugin = password
+auth_type = password
 # Keystone client plugin password option
 password = {{ neutron_service_password }}
 # Keystone client plugin username option
@@ -183,7 +178,6 @@ service_metadata_proxy = {{ nova_metadata_proxy_enabled }}
 
 
 [conductor]
-use_local = false
 topic = conductor
 manager = nova.conductor.manager.ConductorManager
 workers = {{ nova_conductor_workers | default(api_threads) }}