diff --git a/defaults/main.yml b/defaults/main.yml
index 72c7925c..d8429f65 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -18,6 +18,9 @@
 # Verbosity Options
 debug: False
 
+# Comma separated list of Glance API servers
+ironic_glance_api_servers: "{{ (glance_service_internalurl | default('http://localhost')) | netorigin }}"
+
 # Set the package install state for distribution and pip packages
 # Options are 'present' and 'latest'
 ironic_package_state: "latest"
diff --git a/templates/ironic.conf.j2 b/templates/ironic.conf.j2
index ac984d50..57a83425 100644
--- a/templates/ironic.conf.j2
+++ b/templates/ironic.conf.j2
@@ -58,7 +58,7 @@ dhcp_provider = {{ ironic_dhcp_provider }}
 [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 }}
+glance_api_servers = {{ ironic_glance_api_servers }}
 {% if not ironic_standalone | bool %}
 swift_temp_url_key = {{ ironic_swift_temp_url_secret_key }}
 swift_container = {{ ironic_swift_image_container }}