diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index 7e4c0e4..f540de2 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -40,3 +40,15 @@
         python-pymysql:
           fromrepo: ${_param:openstack_version}
           version: latest
+      user:
+        barbican:
+          enabled: true
+          name: barbican
+          home: /var/lib/barbican
+          shell: /bin/bash
+          system: True
+      group:
+        barbican:
+          enabled: true
+          name: barbican
+          system: True
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index befad42..ef27fb6 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -38,3 +38,15 @@
         python-pymysql:
           fromrepo: ${_param:openstack_version}
           version: latest
+      user:
+        barbican:
+          enabled: true
+          name: barbican
+          home: /var/lib/barbican
+          shell: /bin/bash
+          system: True
+      group:
+        barbican:
+          enabled: true
+          name: barbican
+          system: True
diff --git a/jenkins/client/job/vnf-onboarding/init.yml b/jenkins/client/job/vnf-onboarding/init.yml
deleted file mode 100644
index 60f9ce1..0000000
--- a/jenkins/client/job/vnf-onboarding/init.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-classes:
-  - system.jenkins.client.job.vnf-onboarding.deploy_cloudify
-parameters:
-  _param:
-    cluster_public_protocol: https
-    mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
-    vnf_gerrit_credentials: "gerrit"
-    vnf_openstack_api_url: "${_param:cluster_public_protocol}://${_param:cluster_public_host}:5000/v2.0"
-    vnf_openstack_api_credentials: "test-openstack"
-    vnf_openstack_api_admin_credentials: "admin-openstack"
-    vnf_openstack_ssh_key_credentials: "openstack_key"
-    vnf_elastic_url: "${_param:stacklight_log_address}:${_param:cluster_elasticsearch_port}"
-    vnf_docker_registry_path: "${_param:mcp_docker_registry}/mirantis/vnf-onboarding"
-    vnf_artifactory_url: "https://artifactory.mcp.mirantis.net/artifactory/vnf-onboarding-sandbox"
-    contrail_api_url: "http://127.0.0.1:8082"
diff --git a/gerrit/client/project/vnf_onboarding/init.yml b/vnf_onboarding/common/gerrit.yml
similarity index 100%
rename from gerrit/client/project/vnf_onboarding/init.yml
rename to vnf_onboarding/common/gerrit.yml
diff --git a/glance/client/image/vnf_onboarding/init.yml b/vnf_onboarding/common/glance.yml
similarity index 67%
rename from glance/client/image/vnf_onboarding/init.yml
rename to vnf_onboarding/common/glance.yml
index 7d57ca6..0038ed7 100644
--- a/glance/client/image/vnf_onboarding/init.yml
+++ b/vnf_onboarding/common/glance.yml
@@ -1,17 +1,6 @@
 classes:
 - system.glance.client
 parameters:
-  _param:
-    cloudify_enterprise_manager_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_cloudify_enterprise_manager_image_name}.qcow2"
-    cloudify_enterprise_manager_image_name:  "${_param:vnf_cloudify_enterprise_manager_image_name}"
-    cloudify_community_manager_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_cloudify_community_manager_image_name}.qcow2"
-    cloudify_community_manager_image_name: "${_param:vnf_cloudify_community_manager_image_name}"
-    agent_vm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_agent_vm_image_name}.img"
-    agent_vm_image_name:  "${_param:vnf_agent_vm_image_name}"
-    base_agent_vm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_base_agent_vm_image_name}.qcow2"
-    base_agent_vm_image_name:  "${_param:vnf_base_agent_vm_image_name}"
-    base_backend_vm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_base_backend_vm_image_name}.qcow2"
-    base_backend_vm_image_name:  "${_param:vnf_base_backend_vm_image_name}"
   glance:
     client:
       identity:
diff --git a/vnf_onboarding/common/init.yml b/vnf_onboarding/common/init.yml
new file mode 100644
index 0000000..354a327
--- /dev/null
+++ b/vnf_onboarding/common/init.yml
@@ -0,0 +1,23 @@
+parameters:
+  _param:
+    cluster_public_protocol: https
+    mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
+    vnf_gerrit_credentials: "gerrit"
+    vnf_openstack_api_url: "${_param:cluster_public_protocol}://${_param:cluster_public_host}:5000/v2.0"
+    vnf_openstack_api_credentials: "test-openstack"
+    vnf_openstack_api_admin_credentials: "admin-openstack"
+    vnf_openstack_ssh_key_credentials: "openstack_key"
+    vnf_elastic_url: "${_param:stacklight_log_address}:${_param:cluster_elasticsearch_port}"
+    vnf_docker_registry_path: "${_param:mcp_docker_registry}/mirantis/vnf-onboarding"
+    vnf_artifactory_url: "https://artifactory.mcp.mirantis.net/artifactory/vnf-onboarding-sandbox"
+    contrail_api_url: "http://127.0.0.1:8082"
+    cloudify_enterprise_manager_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_cloudify_enterprise_manager_image_name}.qcow2"
+    cloudify_enterprise_manager_image_name:  "${_param:vnf_cloudify_enterprise_manager_image_name}"
+    cloudify_community_manager_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_cloudify_community_manager_image_name}.qcow2"
+    cloudify_community_manager_image_name: "${_param:vnf_cloudify_community_manager_image_name}"
+    agent_vm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_agent_vm_image_name}.img"
+    agent_vm_image_name:  "${_param:vnf_agent_vm_image_name}"
+    base_agent_vm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_base_agent_vm_image_name}.qcow2"
+    base_agent_vm_image_name:  "${_param:vnf_base_agent_vm_image_name}"
+    base_backend_vm_image_url: "${_param:vnf_artifactory_url}/${_param:vnf_base_backend_vm_image_name}.qcow2"
+    base_backend_vm_image_name:  "${_param:vnf_base_backend_vm_image_name}"
diff --git a/jenkins/client/credential/vnf_onboarding.yml b/vnf_onboarding/common/jenkins_credential.yml
similarity index 98%
rename from jenkins/client/credential/vnf_onboarding.yml
rename to vnf_onboarding/common/jenkins_credential.yml
index b668f31..14cabca 100644
--- a/jenkins/client/credential/vnf_onboarding.yml
+++ b/vnf_onboarding/common/jenkins_credential.yml
@@ -1,5 +1,4 @@
 parameters:
-
   jenkins:
     client:
       credential:
diff --git a/jenkins/client/job/vnf-onboarding/deploy_cloudify.yml b/vnf_onboarding/common/jenkins_job.yml
similarity index 100%
rename from jenkins/client/job/vnf-onboarding/deploy_cloudify.yml
rename to vnf_onboarding/common/jenkins_job.yml
diff --git a/keystone/client/vnf_onboarding/init.yml b/vnf_onboarding/common/keystone.yml
similarity index 100%
rename from keystone/client/vnf_onboarding/init.yml
rename to vnf_onboarding/common/keystone.yml
diff --git a/kibana/client/vnf-onboarding/init.yml b/vnf_onboarding/common/kibana.yml
similarity index 100%
rename from kibana/client/vnf-onboarding/init.yml
rename to vnf_onboarding/common/kibana.yml
diff --git a/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/init.yml b/vnf_onboarding/common/mirrors.yml
similarity index 100%
rename from jenkins/client/job/git-mirrors/downstream/vnf_onboarding/init.yml
rename to vnf_onboarding/common/mirrors.yml
diff --git a/nova/client/flavor/vnf_onboarding/init.yml b/vnf_onboarding/common/nova.yml
similarity index 100%
rename from nova/client/flavor/vnf_onboarding/init.yml
rename to vnf_onboarding/common/nova.yml
diff --git a/gerrit/client/project/vnf_onboarding/avi_loadbalancer.yml b/vnf_onboarding/vnf/avi_loadbalancer/gerrit.yml
similarity index 100%
rename from gerrit/client/project/vnf_onboarding/avi_loadbalancer.yml
rename to vnf_onboarding/vnf/avi_loadbalancer/gerrit.yml
diff --git a/glance/client/image/vnf_onboarding/avi_loadbalancer.yml b/vnf_onboarding/vnf/avi_loadbalancer/glance.yml
similarity index 100%
rename from glance/client/image/vnf_onboarding/avi_loadbalancer.yml
rename to vnf_onboarding/vnf/avi_loadbalancer/glance.yml
diff --git a/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml b/vnf_onboarding/vnf/avi_loadbalancer/jenkins_job.yml
similarity index 100%
rename from jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml
rename to vnf_onboarding/vnf/avi_loadbalancer/jenkins_job.yml
diff --git a/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer_template.yml b/vnf_onboarding/vnf/avi_loadbalancer/jenkins_template.yml
similarity index 100%
rename from jenkins/client/job/vnf-onboarding/test_avi_loadbalancer_template.yml
rename to vnf_onboarding/vnf/avi_loadbalancer/jenkins_template.yml
diff --git a/keystone/client/vnf_onboarding/avi_loadbalancer.yml b/vnf_onboarding/vnf/avi_loadbalancer/keystone.yml
similarity index 100%
rename from keystone/client/vnf_onboarding/avi_loadbalancer.yml
rename to vnf_onboarding/vnf/avi_loadbalancer/keystone.yml
diff --git a/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/avi_loadbalancer.yml b/vnf_onboarding/vnf/avi_loadbalancer/mirrors.yml
similarity index 100%
rename from jenkins/client/job/git-mirrors/downstream/vnf_onboarding/avi_loadbalancer.yml
rename to vnf_onboarding/vnf/avi_loadbalancer/mirrors.yml
diff --git a/nova/client/flavor/vnf_onboarding/avi_loadbalancer.yml b/vnf_onboarding/vnf/avi_loadbalancer/nova.yml
similarity index 100%
rename from nova/client/flavor/vnf_onboarding/avi_loadbalancer.yml
rename to vnf_onboarding/vnf/avi_loadbalancer/nova.yml
diff --git a/gerrit/client/project/vnf_onboarding/metaswitch_vsbc.yml b/vnf_onboarding/vnf/metaswitch_vsbc/gerrit.yml
similarity index 100%
rename from gerrit/client/project/vnf_onboarding/metaswitch_vsbc.yml
rename to vnf_onboarding/vnf/metaswitch_vsbc/gerrit.yml
diff --git a/glance/client/image/vnf_onboarding/metaswitch_vsbc.yml b/vnf_onboarding/vnf/metaswitch_vsbc/glance.yml
similarity index 100%
rename from glance/client/image/vnf_onboarding/metaswitch_vsbc.yml
rename to vnf_onboarding/vnf/metaswitch_vsbc/glance.yml
diff --git a/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml b/vnf_onboarding/vnf/metaswitch_vsbc/jenkins_job.yml
similarity index 100%
rename from jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml
rename to vnf_onboarding/vnf/metaswitch_vsbc/jenkins_job.yml
diff --git a/keystone/client/vnf_onboarding/metaswitch_vsbc.yml b/vnf_onboarding/vnf/metaswitch_vsbc/keystone.yml
similarity index 100%
rename from keystone/client/vnf_onboarding/metaswitch_vsbc.yml
rename to vnf_onboarding/vnf/metaswitch_vsbc/keystone.yml
diff --git a/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/metaswitch_vsbc.yml b/vnf_onboarding/vnf/metaswitch_vsbc/mirrors.yml
similarity index 100%
rename from jenkins/client/job/git-mirrors/downstream/vnf_onboarding/metaswitch_vsbc.yml
rename to vnf_onboarding/vnf/metaswitch_vsbc/mirrors.yml
diff --git a/nova/client/flavor/vnf_onboarding/metaswitch_vsbc.yml b/vnf_onboarding/vnf/metaswitch_vsbc/nova.yml
similarity index 100%
rename from nova/client/flavor/vnf_onboarding/metaswitch_vsbc.yml
rename to vnf_onboarding/vnf/metaswitch_vsbc/nova.yml
diff --git a/gerrit/client/project/vnf_onboarding/nginx_vnf.yml b/vnf_onboarding/vnf/mock_nginx/gerrit.yml
similarity index 100%
rename from gerrit/client/project/vnf_onboarding/nginx_vnf.yml
rename to vnf_onboarding/vnf/mock_nginx/gerrit.yml
diff --git a/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml b/vnf_onboarding/vnf/mock_nginx/jenkins_job.yml
similarity index 100%
rename from jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml
rename to vnf_onboarding/vnf/mock_nginx/jenkins_job.yml
diff --git a/jenkins/client/job/vnf-onboarding/test_nginx_vnf_template.yml b/vnf_onboarding/vnf/mock_nginx/jenkins_template.yml
similarity index 100%
rename from jenkins/client/job/vnf-onboarding/test_nginx_vnf_template.yml
rename to vnf_onboarding/vnf/mock_nginx/jenkins_template.yml
diff --git a/keystone/client/vnf_onboarding/nginx_vnf.yml b/vnf_onboarding/vnf/mock_nginx/keystone.yml
similarity index 100%
rename from keystone/client/vnf_onboarding/nginx_vnf.yml
rename to vnf_onboarding/vnf/mock_nginx/keystone.yml
diff --git a/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/nginx_vnf.yml b/vnf_onboarding/vnf/mock_nginx/mirrors.yml
similarity index 100%
rename from jenkins/client/job/git-mirrors/downstream/vnf_onboarding/nginx_vnf.yml
rename to vnf_onboarding/vnf/mock_nginx/mirrors.yml
diff --git a/nova/client/flavor/vnf_onboarding/nginx_vnf.yml b/vnf_onboarding/vnf/mock_nginx/nova.yml
similarity index 100%
rename from nova/client/flavor/vnf_onboarding/nginx_vnf.yml
rename to vnf_onboarding/vnf/mock_nginx/nova.yml