diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index d0e4076..2fcab19 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -5,7 +5,7 @@
 parameters:
   _param:
     horizon_version: kilo
-    horizon_api_version: 3
+    horizon_identity_version: 3
     horizon_identity_endpoint_type: internalURL
   horizon:
     server:
@@ -22,18 +22,19 @@
       cache:
         engine: memcached
         prefix: 'CACHE_HORIZON'
-        members: 
+        members:
         - host: ${_param:cluster_node01_address}
           port: 11211
         - host: ${_param:cluster_node02_address}
           port: 11211
         - host: ${_param:cluster_node03_address}
           port: 11211
+      api_versions:
+        identity: ${_param:horizon_identity_version}
       identity:
         engine: keystone
         host: ${_param:cluster_vip_address}
         port: 5000
-        api_version: 2
         endpoint_type: ${_param:horizon_identity_endpoint_type}
   haproxy:
     proxy:
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index fe119a4..16e78c0 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -29,10 +29,11 @@
         members:
         - host: ${_param:single_address}
           port: 11211
+      api_versions:
+        identity: ${_param:horizon_identity_version}
       identity:
         engine: keystone
         port: 5000
         host: ${_param:horizon_identity_host}
         encryption: ${_param:horizon_identity_encryption}
-        api_version: ${_param:horizon_identity_version}
         endpoint_type: ${_param:horizon_identity_endpoint_type}