diff --git a/keystone/client/vnf_onboarding/avi_loadbalancer.yml b/keystone/client/vnf_onboarding/avi_loadbalancer.yml
new file mode 100644
index 0000000..d14576d
--- /dev/null
+++ b/keystone/client/vnf_onboarding/avi_loadbalancer.yml
@@ -0,0 +1,22 @@
+parameters:
+
+  keystone:
+    client:
+      enabled: true
+      server:
+        identity:
+          test:
+            host: ${_param:keystone_service_host}
+            port: 35357
+            token: ${_param:keystone_service_token}
+            protocol: ${_param:keystone_service_protocol}
+          roles:
+          - Member
+          project:
+            test-avi:
+              description: "OpenStack tenant to execute validation tests against AVI Loadbalancer VNF"
+              user:
+                test:
+                  is_admin: false
+                  password: ${_param:vnf_openstack_test_user_password}
+                  email: ${_param:vnf_openstack_test_user_email}
diff --git a/keystone/client/vnf_onboarding/init.yml b/keystone/client/vnf_onboarding/init.yml
new file mode 100644
index 0000000..ad436fe
--- /dev/null
+++ b/keystone/client/vnf_onboarding/init.yml
@@ -0,0 +1,23 @@
+parameters:
+
+  keystone:
+    client:
+      enabled: true
+      server:
+        identity:
+          admin-test:
+            host: ${_param:keystone_service_host}
+            port: 35357
+            token: ${_param:keystone_service_token}
+            protocol: ${_param:keystone_service_protocol}
+          roles:
+          - admin
+          - Member
+          project:
+            test-cloudify:
+              description: "OpenStack tenant with predeployed cloudify manager"
+              user:
+                admin-test:
+                  is_admin: true
+                  password: ${_param:vnf_openstack_admin_user_password}
+                  email: ${_param:vnf_openstack_admin_user_email}
diff --git a/keystone/client/vnf_onboarding/metaswitch_vsbc.yml b/keystone/client/vnf_onboarding/metaswitch_vsbc.yml
new file mode 100644
index 0000000..42ed04f
--- /dev/null
+++ b/keystone/client/vnf_onboarding/metaswitch_vsbc.yml
@@ -0,0 +1,22 @@
+parameters:
+
+  keystone:
+    client:
+      enabled: true
+      server:
+        identity:
+          test:
+            host: ${_param:keystone_service_host}
+            port: 35357
+            token: ${_param:keystone_service_token}
+            protocol: ${_param:keystone_service_protocol}
+          roles:
+          - Member
+          project:
+            test-metaswitch:
+              description: "OpenStack tenant to execute validation tests against Metaswitch vSBC VNF"
+              user:
+                test:
+                  is_admin: false
+                  password: ${_param:vnf_openstack_test_user_password}
+                  email: ${_param:vnf_openstack_test_user_email}
diff --git a/keystone/client/vnf_onboarding/nginx_vnf.yml b/keystone/client/vnf_onboarding/nginx_vnf.yml
new file mode 100644
index 0000000..be67940
--- /dev/null
+++ b/keystone/client/vnf_onboarding/nginx_vnf.yml
@@ -0,0 +1,22 @@
+parameters:
+
+  keystone:
+    client:
+      enabled: true
+      server:
+        identity:
+          test:
+            host: ${_param:keystone_service_host}
+            port: 35357
+            token: ${_param:keystone_service_token}
+            protocol: ${_param:keystone_service_protocol}
+          roles:
+          - Member
+          project:
+            test-nginx:
+              description: "OpenStack tenant to execute validation tests against Nginx VNF"
+              user:
+                test:
+                  is_admin: false
+                  password: ${_param:vnf_openstack_test_user_password}
+                  email: ${_param:vnf_openstack_test_user_email}