diff --git a/src/lib/charm/openstack/trove.py b/src/lib/charm/openstack/trove.py
index 33f9c4a..5a69d89 100644
--- a/src/lib/charm/openstack/trove.py
+++ b/src/lib/charm/openstack/trove.py
@@ -149,7 +149,7 @@ class TroveCharm(charms_openstack.charm.HAOpenStackCharm):
     services = ['trove-api', 'trove-taskmanager', 'trove-conductor']
 
     #not sure if this will work or not
-    adapters_class = charms_openstack.adapters.OpenStackRelationAdapters
+    adapters_class = charms_openstack.adapters.OpenStackAPIRelationAdapters
     #adapters_class = TroveAdapters
 
     default_service = 'trove-api'
diff --git a/src/templates/mitaka/trove-conductor.conf b/src/templates/mitaka/trove-conductor.conf
index f671587..00d1e25 100644
--- a/src/templates/mitaka/trove-conductor.conf
+++ b/src/templates/mitaka/trove-conductor.conf
@@ -2,7 +2,8 @@
 verbose = {{ options.verbose }}
 debug = {{ options.debug }}
 
-trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ options.keystone_api_version }}.0
+#trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ options.keystone_api_version }}.0
+trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ identity_service.api_version }}
 
 # The manager class to use for conductor. (string value)
 conductor_manager = trove.conductor.manager.Manager
diff --git a/src/templates/mitaka/trove-taskmanager.conf b/src/templates/mitaka/trove-taskmanager.conf
index 4b4448f..a45ddce 100644
--- a/src/templates/mitaka/trove-taskmanager.conf
+++ b/src/templates/mitaka/trove-taskmanager.conf
@@ -8,7 +8,8 @@ debug = {{ options.debug }}
 update_status_on_fail = True
 
 log_dir = /var/log/trove
-trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ options.keystone_api_version }}.0
+#trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ options.keystone_api_version }}.0
+trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ identity_service.api_version }}
 notifier_queue_hostname = controller
 backend = rabbit
 
diff --git a/src/templates/mitaka/trove.conf b/src/templates/mitaka/trove.conf
index f2d4532..37a7524 100644
--- a/src/templates/mitaka/trove.conf
+++ b/src/templates/mitaka/trove.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 auth_strategy = keystone
 log_dir = /var/log/trove
-trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ options.keystone_api_version }}.0
+trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ identity_service.api_version }}
 notifier_queue_hostname = controller
 
 # Show more verbose log output (sets INFO log level output)