diff --git a/defaults/main.yml b/defaults/main.yml
index 2fd1392d..72c7925c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -250,7 +250,6 @@ ironic_uwsgi_bind_address: 0.0.0.0
 ### OpenStack Services to integrate with
 
 # Glance
-# ironic_glance_host: x.x.x.x
 ironic_glance_auth_strategy: "{{ ironic_openstack_auth_strategy }}"
 
 # Neutron
diff --git a/templates/ironic.conf.j2 b/templates/ironic.conf.j2
index b57b6582..a9d10da0 100644
--- a/templates/ironic.conf.j2
+++ b/templates/ironic.conf.j2
@@ -44,6 +44,9 @@ pool_timeout = {{ ironic_db_pool_timeout }}
 
 [deploy]
 erase_devices_priority = {{ ironic_erase_devices_priority }}
+{% if not ironic_standalone | bool %}
+object_store_endpoint_type = {{ ironic_swift_url_endpoint_type }}
+{% endif %}
 
 [dhcp]
 dhcp_provider = {{ ironic_dhcp_provider }}
@@ -53,6 +56,8 @@ dhcp_provider = {{ ironic_dhcp_provider }}
 [disk_utils]
 
 [glance]
+# TODO(evrardjp): Remove this in the future to use the service catalog
+# and reduce the amount of variables.
 glance_api_servers = {{ glance_api_servers }}
 {% if not ironic_standalone | bool %}
 swift_temp_url_key = {{ ironic_swift_temp_url_secret_key }}
@@ -60,7 +65,6 @@ swift_container = {{ ironic_swift_image_container }}
 swift_endpoint_url = {{ ironic_swift_endpoint }}
 swift_account = {{ ironic_swift_auth_account }}
 swift_api_version = {{ ironic_swift_api_version }}
-temp_url_endpoint_type = {{ ironic_swift_url_endpoint_type }}
 {% endif %}
 
 [iboot]