diff --git a/gerrit/client/project/vnf_onboarding.yml b/gerrit/client/project/vnf_onboarding.yml
deleted file mode 100644
index 1e7d238..0000000
--- a/gerrit/client/project/vnf_onboarding.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        vnf-onboarding/avi-loadbalancer:
-          enabled: true
-          description: AVI VNF
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/avi-loadbalancer
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
-        vnf-onboarding/metaswitch-vsbc:
-          enabled: true
-          description: Metaswitch vSBC VNF
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/metaswitch-vsbc
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
-        vnf-onboarding/nfv-platform:
-          enabled: true
-          description: Onboarding platform blueprints and tools
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/nfv-platform
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
-        vnf-onboarding/nginx-vnf:
-          enabled: true
-          description: NGINX VNF
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/nginx-vnf
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
-        vnf-onboarding/pipelines:
-          enabled: true
-          description: VNF onboarding pipelines
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/pipelines
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
-        vnf-onboarding/platform-tests:
-          enabled: true
-          description: VNF onboarding platform tests
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/platform-tests
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
diff --git a/gerrit/client/project/vnf_onboarding/avi_loadbalancer.yml b/gerrit/client/project/vnf_onboarding/avi_loadbalancer.yml
new file mode 100644
index 0000000..1bb17b6
--- /dev/null
+++ b/gerrit/client/project/vnf_onboarding/avi_loadbalancer.yml
@@ -0,0 +1,12 @@
+parameters:
+  gerrit:
+    client:
+      project:
+        vnf-onboarding/avi-loadbalancer:
+          enabled: true
+          description: AVI VNF
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/avi-loadbalancer
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
\ No newline at end of file
diff --git a/gerrit/client/project/vnf_onboarding/init.yml b/gerrit/client/project/vnf_onboarding/init.yml
new file mode 100644
index 0000000..a1e616e
--- /dev/null
+++ b/gerrit/client/project/vnf_onboarding/init.yml
@@ -0,0 +1,20 @@
+parameters:
+  gerrit:
+    client:
+      project:
+        vnf-onboarding/nfv-platform:
+          enabled: true
+          description: Onboarding platform blueprints and tools
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/nfv-platform
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
+        vnf-onboarding/pipelines:
+          enabled: true
+          description: VNF onboarding pipelines
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/pipelines
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
diff --git a/gerrit/client/project/vnf_onboarding/metaswitch_vsbc.yml b/gerrit/client/project/vnf_onboarding/metaswitch_vsbc.yml
new file mode 100644
index 0000000..9bbd891
--- /dev/null
+++ b/gerrit/client/project/vnf_onboarding/metaswitch_vsbc.yml
@@ -0,0 +1,20 @@
+parameters:
+  gerrit:
+    client:
+      project:
+        vnf-onboarding/metaswitch-vsbc:
+          enabled: true
+          description: Metaswitch vSBC VNF
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/metaswitch-vsbc
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
+        vnf-onboarding/platform-tests:
+          enabled: true
+          description: VNF onboarding platform tests
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/platform-tests
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
diff --git a/gerrit/client/project/vnf_onboarding/nginx_vnf.yml b/gerrit/client/project/vnf_onboarding/nginx_vnf.yml
new file mode 100644
index 0000000..3549fe7
--- /dev/null
+++ b/gerrit/client/project/vnf_onboarding/nginx_vnf.yml
@@ -0,0 +1,12 @@
+parameters:
+  gerrit:
+    client:
+      project:
+        vnf-onboarding/nginx-vnf:
+          enabled: true
+          description: NGINX VNF
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/nginx-vnf
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
\ No newline at end of file