diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
index f104b102f0..989c9c9809 100644
--- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2
+++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
@@ -11,15 +11,15 @@ taskmanager_manager = trove.taskmanager.manager.Manager
 transport_url = {{ rpc_transport_url }}
 
 trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
-{% if enable_nova | bool %}
-nova_compute_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}/v2
-{% endif %}
-{% if enable_cinder | bool %}
-cinder_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v1
-{% endif %}
-{% if enable_swift | bool %}
-swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_
-{% endif %}
+
+nova_compute_endpoint_type = internalURL
+neutron_endpoint_type = internalURL
+neutron_endpoint_type = internalURL
+swift_endpoint_type = internalURL
+glance_endpoint_type = internalURL
+trove_endpoint_type = internalURL
+
+network_driver = trove.network.neutron.NeutronDriver
 
 [database]
 connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index 9b509e1151..c7c27cfb02 100644
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -13,17 +13,17 @@ auth_strategy = keystone
 transport_url = {{ rpc_transport_url }}
 
 trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
-{% if enable_nova | bool %}
-nova_compute_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}/v2
-{% endif %}
-{% if enable_cinder | bool %}
-cinder_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v1
-{% endif %}
-{% if enable_swift | bool %}
-swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_
-{% elif enable_ceph_rgw_keystone | bool %}
-swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ rgw_port }}/v1/AUTH_
-{% endif %}
+
+nova_compute_endpoint_type = internalURL
+neutron_endpoint_type = internalURL
+neutron_endpoint_type = internalURL
+swift_endpoint_type = internalURL
+glance_endpoint_type = internalURL
+trove_endpoint_type = internalURL
+
+network_driver = trove.network.neutron.NeutronDriver
+
+network_label_regex = .*
 
 [database]
 connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}