diff --git a/gerrit/client/project/build/calico.yml b/gerrit/client/project/build/calico.yml
deleted file mode 100644
index a81cecd..0000000
--- a/gerrit/client/project/build/calico.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-calico:
-          enabled: true
-          description: 
-          upstream: https://github.com/tcpcloud/docker-calico.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/build/devops-portal.yml b/gerrit/client/project/build/devops-portal.yml
deleted file mode 100644
index 06fe2ae..0000000
--- a/gerrit/client/project/build/devops-portal.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        devops-portal:
-          enabled: true
-          description:
-          upstream: https://github.com/tcpcloud/devops-portal.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/build/galera.yml b/gerrit/client/project/build/galera.yml
deleted file mode 100644
index cf2dc98..0000000
--- a/gerrit/client/project/build/galera.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-galera:
-          enabled: true
-          description:
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/build/hyperkube.yml b/gerrit/client/project/build/hyperkube.yml
deleted file mode 100644
index 22304ba..0000000
--- a/gerrit/client/project/build/hyperkube.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-hyperkube:
-          enabled: true
-          description: 
-          upstream: https://github.com/tcpcloud/docker-hyperkube.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/build/libvirt.yml b/gerrit/client/project/build/libvirt.yml
deleted file mode 100644
index 6dbd4fe..0000000
--- a/gerrit/client/project/build/libvirt.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-libvirt:
-          enabled: true
-          description:
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
\ No newline at end of file
diff --git a/gerrit/client/project/build/memcached.yml b/gerrit/client/project/build/memcached.yml
deleted file mode 100644
index 3edcee3..0000000
--- a/gerrit/client/project/build/memcached.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-memcached:
-          enabled: true
-          description:
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
\ No newline at end of file
diff --git a/gerrit/client/project/build/opencontrail.yml b/gerrit/client/project/build/opencontrail.yml
deleted file mode 100644
index ed09288..0000000
--- a/gerrit/client/project/build/opencontrail.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        contrail-pipeline:
-          enabled: true
-          description: 
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        docker-opencontrail:
-          enabled: true
-          description: 
-          #upstream: https://github.com/Mirantis/ccp-docker-opencontrail.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        ifmap-python-client:
-          enabled: true
-          description: 
-          upstream: https://github.com/tcpcloud/ifmap-python-client
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-build:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-build
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-controller:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-controller
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-vrouter:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-vrouter
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-third-party:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-third-party
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-generateDS:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-generateDS
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-sandesh:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-sandesh
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-packages:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-packages
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-nova-vif-driver:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-nova-vif-driver
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-neutron-plugin:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-neutron-plugin
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-nova-extensions:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-nova-extensions
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-heat:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-heat
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-ceilometer-plugin:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-ceilometer-plugin
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-web-storage:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-web-storage
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-web-server-manager:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-web-server-manager
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-web-controller:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-web-controller
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-web-core:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-web-core
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        contrail-webui-third-party:
-          enabled: true
-          description: 
-          upstream: https://github.com/Juniper/contrail-webui-third-party
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/build/openstack/cinder.yml b/gerrit/client/project/build/openstack/cinder.yml
deleted file mode 100644
index f02dc89..0000000
--- a/gerrit/client/project/build/openstack/cinder.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-cinder:
-          enabled: true
-          description: 
-          #upstream: https://github.com/Mirantis/ccp-docker-cinder.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        cinder:
-          enabled: true
-          description: 
-          upstream: https://github.com/openstack/cinder.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
\ No newline at end of file
diff --git a/gerrit/client/project/build/openstack/common.yml b/gerrit/client/project/build/openstack/common.yml
deleted file mode 100644
index 7449daa..0000000
--- a/gerrit/client/project/build/openstack/common.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        openstack-requirements:
-          enabled: true
-          description: 
-          upstream: https://github.com/openstack/requirements.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/build/openstack/glance.yml b/gerrit/client/project/build/openstack/glance.yml
deleted file mode 100644
index 3a1318c..0000000
--- a/gerrit/client/project/build/openstack/glance.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-glance:
-          enabled: true
-          description: 
-          #upstream: https://github.com/Mirantis/ccp-docker-glance.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        glance:
-          enabled: true
-          description: 
-          upstream: https://github.com/openstack/glance.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
\ No newline at end of file
diff --git a/gerrit/client/project/build/openstack/heat.yml b/gerrit/client/project/build/openstack/heat.yml
deleted file mode 100644
index 5335652..0000000
--- a/gerrit/client/project/build/openstack/heat.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-heat:
-          enabled: true
-          description: 
-          #upstream: https://github.com/Mirantis/ccp-docker-heat.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        heat:
-          enabled: true
-          description: 
-          upstream: https://github.com/openstack/heat.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/build/openstack/keystone.yml b/gerrit/client/project/build/openstack/keystone.yml
deleted file mode 100644
index 45ee3d1..0000000
--- a/gerrit/client/project/build/openstack/keystone.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-keystone:
-          enabled: true
-          description: 
-          #upstream: https://github.com/Mirantis/ccp-docker-keystone.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        keystone:
-          enabled: true
-          description: 
-          upstream: https://github.com/openstack/keystone.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/build/openstack/neutron.yml b/gerrit/client/project/build/openstack/neutron.yml
deleted file mode 100644
index 995c602..0000000
--- a/gerrit/client/project/build/openstack/neutron.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-neutron:
-          enabled: true
-          description: 
-          #upstream: https://github.com/Mirantis/ccp-docker-neutron.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        neutron:
-          enabled: true
-          description: 
-          upstream: https://github.com/openstack/neutron.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
\ No newline at end of file
diff --git a/gerrit/client/project/build/openstack/nova.yml b/gerrit/client/project/build/openstack/nova.yml
deleted file mode 100644
index cca2f6d..0000000
--- a/gerrit/client/project/build/openstack/nova.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-nova:
-          enabled: true
-          description: 
-          #upstream: https://github.com/Mirantis/ccp-docker-nova.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        nova:
-          enabled: true
-          description: 
-          upstream: https://github.com/openstack/nova.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
-        novnc:
-          enabled: true
-          description:
-          upstream: https://github.com/kanaka/noVNC.git
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/build/rabbitmq.yml b/gerrit/client/project/build/rabbitmq.yml
deleted file mode 100644
index eecd2be..0000000
--- a/gerrit/client/project/build/rabbitmq.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        docker-rabbitmq:
-          enabled: true
-          description:
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/deploy/reclass_salt_model.yml b/gerrit/client/project/reclass/reclass_model_cluster.yml
similarity index 86%
rename from gerrit/client/project/deploy/reclass_salt_model.yml
rename to gerrit/client/project/reclass/reclass_model_cluster.yml
index 171e3ae..96ddd41 100644
--- a/gerrit/client/project/deploy/reclass_salt_model.yml
+++ b/gerrit/client/project/reclass/reclass_model_cluster.yml
@@ -2,10 +2,9 @@
   gerrit:
     client:
       project:
-        reclass-salt-model:
+        reclass-model-cluster:
           enabled: true
-          description:
-            upstream: git@github.com:Mirantis/ccp-poc-salt-model.git
+          description: Reclass cluster model
           access:
             "refs/heads/*":
               actions:
diff --git a/gerrit/client/project/salt/init.yml b/gerrit/client/project/salt/init.yml
new file mode 100644
index 0000000..d9ce6eb
--- /dev/null
+++ b/gerrit/client/project/salt/init.yml
@@ -0,0 +1,4 @@
+include:
+- gerrit.client.project.salt.salt_formula_linux
+- gerrit.client.project.salt.salt_formula_nova
+- gerrit.client.project.salt.salt_formula_salt
diff --git a/gerrit/client/project/deploy/reclass_salt_model.yml b/gerrit/client/project/salt/salt_formula_linux.yml
similarity index 84%
copy from gerrit/client/project/deploy/reclass_salt_model.yml
copy to gerrit/client/project/salt/salt_formula_linux.yml
index 171e3ae..d8d026b 100644
--- a/gerrit/client/project/deploy/reclass_salt_model.yml
+++ b/gerrit/client/project/salt/salt_formula_linux.yml
@@ -2,10 +2,10 @@
   gerrit:
     client:
       project:
-        reclass-salt-model:
+        salt-formula-linux:
           enabled: true
-          description:
-            upstream: git@github.com:Mirantis/ccp-poc-salt-model.git
+          description: Linux formula
+          upstream: https://github.com/tcpcloud/salt-formula-linux.git
           access:
             "refs/heads/*":
               actions:
diff --git a/gerrit/client/project/deploy/reclass_salt_model.yml b/gerrit/client/project/salt/salt_formula_nova.yml
similarity index 84%
copy from gerrit/client/project/deploy/reclass_salt_model.yml
copy to gerrit/client/project/salt/salt_formula_nova.yml
index 171e3ae..3424ec0 100644
--- a/gerrit/client/project/deploy/reclass_salt_model.yml
+++ b/gerrit/client/project/salt/salt_formula_nova.yml
@@ -2,10 +2,10 @@
   gerrit:
     client:
       project:
-        reclass-salt-model:
+        salt-formula-nova:
           enabled: true
-          description:
-            upstream: git@github.com:Mirantis/ccp-poc-salt-model.git
+          description: OpenStack Nova formula
+          upstream: https://github.com/openstack/salt-formula-nova.git
           access:
             "refs/heads/*":
               actions:
diff --git a/gerrit/client/project/deploy/reclass_salt_model.yml b/gerrit/client/project/salt/salt_formula_salt.yml
similarity index 85%
copy from gerrit/client/project/deploy/reclass_salt_model.yml
copy to gerrit/client/project/salt/salt_formula_salt.yml
index 171e3ae..95668a0 100644
--- a/gerrit/client/project/deploy/reclass_salt_model.yml
+++ b/gerrit/client/project/salt/salt_formula_salt.yml
@@ -2,10 +2,10 @@
   gerrit:
     client:
       project:
-        reclass-salt-model:
+        salt-formula-salt:
           enabled: true
-          description:
-            upstream: git@github.com:Mirantis/ccp-poc-salt-model.git
+          description: Salt formula
+          upstream: https://github.com/tcpcloud/salt-formula-salt.git
           access:
             "refs/heads/*":
               actions: