diff --git a/os_client_config/cloud_config.py b/os_client_config/cloud_config.py
index fec3500..776ea8a 100644
--- a/os_client_config/cloud_config.py
+++ b/os_client_config/cloud_config.py
@@ -367,7 +367,7 @@ class CloudConfig(object):
         endpoint_override = self.get_endpoint(service_key)
 
         if not interface_key:
-            if service_key in ('image', 'key-manager', 'identity'):
+            if service_key in ('image', 'key-manager'):
                 interface_key = 'interface'
             else:
                 interface_key = 'endpoint_type'
diff --git a/os_client_config/tests/test_cloud_config.py b/os_client_config/tests/test_cloud_config.py
index 5df1faf..3ec7ecf 100644
--- a/os_client_config/tests/test_cloud_config.py
+++ b/os_client_config/tests/test_cloud_config.py
@@ -550,7 +550,7 @@ class TestCloudConfig(base.TestCase):
         mock_client.assert_called_with(
             version='2.0',
             endpoint='http://example.com/v2',
-            interface='admin',
+            endpoint_type='admin',
             endpoint_override=None,
             region_name='region-al',
             service_type='identity',
@@ -570,7 +570,7 @@ class TestCloudConfig(base.TestCase):
         mock_client.assert_called_with(
             version='3',
             endpoint='http://example.com',
-            interface='admin',
+            endpoint_type='admin',
             endpoint_override=None,
             region_name='region-al',
             service_type='identity',