diff --git a/keystone/client/service/aodh.yml b/keystone/client/service/aodh.yml
index e7b0dbb..7ed3772 100644
--- a/keystone/client/service/aodh.yml
+++ b/keystone/client/service/aodh.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.aodh
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/barbican.yml b/keystone/client/service/barbican.yml
index d222fb6..aeb7035 100644
--- a/keystone/client/service/barbican.yml
+++ b/keystone/client/service/barbican.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.barbican
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/billometer.yml b/keystone/client/service/billometer.yml
index 6100dc9..282848e 100644
--- a/keystone/client/service/billometer.yml
+++ b/keystone/client/service/billometer.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.billometer
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/ceilometer.yml b/keystone/client/service/ceilometer.yml
index 40f4ebf..ba4d66e 100644
--- a/keystone/client/service/ceilometer.yml
+++ b/keystone/client/service/ceilometer.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.ceilometer
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/cinder.yml b/keystone/client/service/cinder.yml
index 64705e3..958fae1 100644
--- a/keystone/client/service/cinder.yml
+++ b/keystone/client/service/cinder.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.cinder
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/cinder2.yml b/keystone/client/service/cinder2.yml
index cb289e1..a7e8e49 100644
--- a/keystone/client/service/cinder2.yml
+++ b/keystone/client/service/cinder2.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.cinder2
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/cinder3.yml b/keystone/client/service/cinder3.yml
index d5e0ae1..5c6b6d0 100644
--- a/keystone/client/service/cinder3.yml
+++ b/keystone/client/service/cinder3.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.cinder3
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/congress.yml b/keystone/client/service/congress.yml
index 49e8337..a6599d5 100644
--- a/keystone/client/service/congress.yml
+++ b/keystone/client/service/congress.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.congress
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/designate.yml b/keystone/client/service/designate.yml
index 75a588e..b1828cc 100644
--- a/keystone/client/service/designate.yml
+++ b/keystone/client/service/designate.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.designate
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/glance.yml b/keystone/client/service/glance.yml
index 3c0db9c..ac4394f 100644
--- a/keystone/client/service/glance.yml
+++ b/keystone/client/service/glance.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.glance
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/gnocchi.yml b/keystone/client/service/gnocchi.yml
index 6707764..27d38b0 100644
--- a/keystone/client/service/gnocchi.yml
+++ b/keystone/client/service/gnocchi.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.gnocchi
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/heat-cfn.yml b/keystone/client/service/heat-cfn.yml
index 1a2486a..2ccafc9 100644
--- a/keystone/client/service/heat-cfn.yml
+++ b/keystone/client/service/heat-cfn.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.heat-cfn
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/heat.yml b/keystone/client/service/heat.yml
index c8882dd..28aa582 100644
--- a/keystone/client/service/heat.yml
+++ b/keystone/client/service/heat.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.heat
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/ironic.yml b/keystone/client/service/ironic.yml
index e4c384c..c1b00d0 100644
--- a/keystone/client/service/ironic.yml
+++ b/keystone/client/service/ironic.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.ironic
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/keystone.yml b/keystone/client/service/keystone.yml
index ba116f8..0cfa963 100644
--- a/keystone/client/service/keystone.yml
+++ b/keystone/client/service/keystone.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.keystone
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/manila.yml b/keystone/client/service/manila.yml
index 07e88b2..d230892 100644
--- a/keystone/client/service/manila.yml
+++ b/keystone/client/service/manila.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.manila
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/manila2.yml b/keystone/client/service/manila2.yml
index 1a3a125..ae9a02f 100644
--- a/keystone/client/service/manila2.yml
+++ b/keystone/client/service/manila2.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.manila2
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/neutron.yml b/keystone/client/service/neutron.yml
index 8bec7f2..06690ce 100644
--- a/keystone/client/service/neutron.yml
+++ b/keystone/client/service/neutron.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.neutron
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/nova-placement.yml b/keystone/client/service/nova-placement.yml
index 3ed0654..3ab8e95 100644
--- a/keystone/client/service/nova-placement.yml
+++ b/keystone/client/service/nova-placement.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.nova-placement
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/nova.yml b/keystone/client/service/nova.yml
index ca20106..147d0f7 100644
--- a/keystone/client/service/nova.yml
+++ b/keystone/client/service/nova.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.nova
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/nova21.yml b/keystone/client/service/nova21.yml
index 2782ec2..33ebda5 100644
--- a/keystone/client/service/nova21.yml
+++ b/keystone/client/service/nova21.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.nova21
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/octavia.yml b/keystone/client/service/octavia.yml
index c08312e..304d70f 100644
--- a/keystone/client/service/octavia.yml
+++ b/keystone/client/service/octavia.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.octavia
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/panko.yml b/keystone/client/service/panko.yml
index 6f86b36..6c6a036 100644
--- a/keystone/client/service/panko.yml
+++ b/keystone/client/service/panko.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.panko
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/radosgw-s3.yml b/keystone/client/service/radosgw-s3.yml
index c97c812..e53d9fc 100644
--- a/keystone/client/service/radosgw-s3.yml
+++ b/keystone/client/service/radosgw-s3.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.radosgw-s3
 parameters:
   _param:
     cluster_public_protocol: https
diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index 14a24af..a643433 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -1,3 +1,5 @@
+classes:
+- system.keystone.client.v3.service.radosgw-swift
 parameters:
   _param:
     cluster_public_protocol: https