diff --git a/metadata/service/client/cluster.yml b/metadata/service/client/cluster.yml
index 05e608b..d5dadbb 100644
--- a/metadata/service/client/cluster.yml
+++ b/metadata/service/client/cluster.yml
@@ -3,6 +3,7 @@
 parameters:
   opencontrail:
     client:
+      version: 2.21
       identity:
         engine: keystone
         host: ${_param:cluster_vip_address}
diff --git a/metadata/service/client/single.yml b/metadata/service/client/single.yml
index 92290b3..a48d2c9 100644
--- a/metadata/service/client/single.yml
+++ b/metadata/service/client/single.yml
@@ -3,6 +3,7 @@
 parameters:
   opencontrail:
     client:
+      version: 2.21
       identity:
         engine: keystone
         host: ${_param:cluster_local_address}