diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index fdd225dea1..f26cab7900 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -9,8 +9,6 @@ bind_host = {{ api_interface_address }}
 bind_port = {{ glance_api_listen_port }}
 workers = {{ openstack_service_workers }}
 
-registry_host = {{ glance_internal_fqdn }}
-
 {% if glance_backend_ceph | bool %}
 show_multiple_locations = True
 {% endif %}
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index e9da76dce6..7176adaad6 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -12,8 +12,6 @@ stack_domain_admin = heat_domain_admin
 stack_domain_admin_password = {{ heat_domain_admin_password }}
 stack_user_domain_name = heat_user_domain
 
-deferred_auth_method = trusts
-
 {% if service_name == 'heat-engine' %}
 num_engine_workers = {{ openstack_service_workers }}
 {% endif %}