diff --git a/gerrit/client/init.yml b/gerrit/client/init.yml
index ab2860b..a9bb4de 100644
--- a/gerrit/client/init.yml
+++ b/gerrit/client/init.yml
@@ -1,14 +1,20 @@
+classes:
+  - service.gerrit.client
 parameters:
   gerrit:
     client:
       enabled: True
+      source:
+        engine: pip
       dir:
         git: /srv/volumes/gerrit/git
+        gerrit_config: /srv/volumes/gerrit/etc/gerrit.config
+        gerrit_secure_config: /srv/volumes/gerrit/etc/secure.config
       server:
-        host: ${_param:openstack_control_address}
+        host: ${_param:cluster_vip_address}
         user: admin
-        email: root@localhost
-        http_port: 8083
+        email: ${_param:gerrit_admin_email}
+        http_port: 8080
         ssh_port: 29418
         protocol: http
         password: ${_param:gerrit_admin_password}
@@ -16,21 +22,12 @@
       group:
         Event Streaming Users:
           description: Event Streaming Users
-        mcp_fuel_aio-core:
+        devops-core:
           description: Core maintainers
-        mcp_fuel_aio-release:
+        devops-release:
           description: Release engineers
-        mcp_fuel_aio-contrib:
+        devops-contrib:
           description: Service developers
-      user:
-        jenkins:
-          fullname: Non-Interactive Jenkins
-          email: "jenkins@mirantis.com"
-          ssh_key: ${_param:gerrit_admin_public_key}
-          http_password: password
-          groups:
-          - Event Streaming Users
-          - Non-Interactive Users
       default_access:
         "refs/*":
           actions:
@@ -39,12 +36,12 @@
         "refs/heads/*":
           actions:
           - name: abandon
-            group: ccp-poc-core
+            group: devops-core
           - name: create
-            group: ccp-poc-release
+            group: devops-core
           labels:
           - name: label-Code-Review
-            group: ccp-poc-core
+            group: devops-core
             score: -2..+2
           - name: label-Code-Review
             group: Non-Interactive Users
@@ -53,9 +50,17 @@
             group: Non-Interactive Users
             score: -1..+1
           - name: label-Workflow
-            group: ccp-poc-core
+            group: devops-core
             score: -1..+1
         "refs/tags/*":
           actions:
           - name: pushSignedTag
-            group: ${_param:cluster_name}-release
+            group: devops-core
+          - name: create
+            group: devops-core
+          - name: push
+            group: devops-core
+          - name: forgeCommitter
+            group: devops-core
+          - name: forgeAuthor
+            group: devops-core
diff --git a/gerrit/client/project/reclass/reclass_model_cluster.yml b/gerrit/client/project/reclass/reclass_model_cluster.yml
deleted file mode 100644
index 96ddd41..0000000
--- a/gerrit/client/project/reclass/reclass_model_cluster.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        reclass-model-cluster:
-          enabled: true
-          description: Reclass cluster model
-          access:
-            "refs/heads/*":
-              actions:
-              - name: abandon
-                group: ${_param:cluster_name}-core
-              - name: create
-                group: ${_param:cluster_name}-release
-              labels:
-              - name: label-Code-Review
-                group: ${_param:cluster_name}-core
-                score: -2..+2
-              - name: label-Workflow
-                group: ${_param:cluster_name}-core
-                score: -1..+1
-            "refs/tags/*":
-              actions:
-              - name: pushSignedTag
-                group: ${_param:cluster_name}-release
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/salt/init.yml b/gerrit/client/project/salt/init.yml
deleted file mode 100644
index d9ce6eb..0000000
--- a/gerrit/client/project/salt/init.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-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/salt/salt_formula_linux.yml b/gerrit/client/project/salt/salt_formula_linux.yml
deleted file mode 100644
index d8d026b..0000000
--- a/gerrit/client/project/salt/salt_formula_linux.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        salt-formula-linux:
-          enabled: true
-          description: Linux formula
-          upstream: https://github.com/tcpcloud/salt-formula-linux.git
-          access:
-            "refs/heads/*":
-              actions:
-              - name: abandon
-                group: ${_param:cluster_name}-core
-              - name: create
-                group: ${_param:cluster_name}-release
-              labels:
-              - name: label-Code-Review
-                group: ${_param:cluster_name}-core
-                score: -2..+2
-              - name: label-Workflow
-                group: ${_param:cluster_name}-core
-                score: -1..+1
-            "refs/tags/*":
-              actions:
-              - name: pushSignedTag
-                group: ${_param:cluster_name}-release
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/salt/salt_formula_nova.yml b/gerrit/client/project/salt/salt_formula_nova.yml
deleted file mode 100644
index 3424ec0..0000000
--- a/gerrit/client/project/salt/salt_formula_nova.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        salt-formula-nova:
-          enabled: true
-          description: OpenStack Nova formula
-          upstream: https://github.com/openstack/salt-formula-nova.git
-          access:
-            "refs/heads/*":
-              actions:
-              - name: abandon
-                group: ${_param:cluster_name}-core
-              - name: create
-                group: ${_param:cluster_name}-release
-              labels:
-              - name: label-Code-Review
-                group: ${_param:cluster_name}-core
-                score: -2..+2
-              - name: label-Workflow
-                group: ${_param:cluster_name}-core
-                score: -1..+1
-            "refs/tags/*":
-              actions:
-              - name: pushSignedTag
-                group: ${_param:cluster_name}-release
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/project/salt/salt_formula_salt.yml b/gerrit/client/project/salt/salt_formula_salt.yml
deleted file mode 100644
index 95668a0..0000000
--- a/gerrit/client/project/salt/salt_formula_salt.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        salt-formula-salt:
-          enabled: true
-          description: Salt formula
-          upstream: https://github.com/tcpcloud/salt-formula-salt.git
-          access:
-            "refs/heads/*":
-              actions:
-              - name: abandon
-                group: ${_param:cluster_name}-core
-              - name: create
-                group: ${_param:cluster_name}-release
-              labels:
-              - name: label-Code-Review
-                group: ${_param:cluster_name}-core
-                score: -2..+2
-              - name: label-Workflow
-                group: ${_param:cluster_name}-core
-                score: -1..+1
-            "refs/tags/*":
-              actions:
-              - name: pushSignedTag
-                group: ${_param:cluster_name}-release
-          require_change_id: true
-          require_agreement: true
-          merge_content: true
diff --git a/gerrit/client/single.yml b/gerrit/client/single.yml
deleted file mode 100644
index cfabc1d..0000000
--- a/gerrit/client/single.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-parameters:
-  _param:
-    gerrit_server_port: 8082
-  gerrit:
-    client:
-      enabled: True
-      server: 
-        host: ${_param:gerrit_server_host}
-        user: admin
-        email: root@localhost
-        http_port: ${_param:gerrit_server_port}
-        ssh_port: 29418
-        protocol: http
-        password: ${_param:gerrit_admin_password}
-        key: ${_param:gerrit_admin_private_key}
diff --git a/gerrit/client/team/customer.yml b/gerrit/client/team/customer.yml
deleted file mode 100644
index 12ca541..0000000
--- a/gerrit/client/team/customer.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      user: {}
\ No newline at end of file
diff --git a/gerrit/client/team/mirantis.yml b/gerrit/client/team/mirantis.yml
index 0d8a4e1..33e0bed 100644
--- a/gerrit/client/team/mirantis.yml
+++ b/gerrit/client/team/mirantis.yml
@@ -5,24 +5,21 @@
         akomarek:
           fullname: Ales Komarek
           email: "akomarek@mirantis.com"
-          http_password: password
           ssh_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3odU+3V2uDA2ptAFL9hrJRPNEEdAyztWOZFQ5Oyd9oerTGOU3p4xmrgWWjfKFKbYGhiiIUcYAol5PkTfKukGEkkjCHYA1t023soCaaAj85wCZCnw2zQNAziwxTYmAzTqgxiSvtZNMMrtJvFHRIRDzJ3M1lV0prWNWkMM1/3FAd4W49y6VT3fkMCo8uqG7CfGdgR2DgBCxf9KaNPfW5eDEPOgmE5lK8tVSEI6T+Cg7hbcTf4lFYnlFBnlQgp/0JstsM4Vbwb4B34LOpOsf2S8rrWk2xQMjwaMHXkc2s/E8iW3F5nVFuyEXYISFQIiAHw8dzC6CHgLcyHUVWwznKawZ
           groups:
-          - ${_param:cluster_name}_core
-          - ${_param:cluster_name}_release
+          - devops-core
+          - devops-release
         jpavlik:
           fullname: Jakub Pavlik
           email: "jpavlik@mirantis.com"
-          http_password: password
           ssh_key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAylDZDzgMuEsJQpwFHDW+QivCVhryxXd1/HWqq1TVhJmT9oNAYdhUBnf/9kVtgmP0EWpDJtGSEaSugCmx8KE76I64RhpOTlm7wO0FFUVnzhFtTPx38WHfMjMdk1HF8twZU4svi72Xbg1KyBimwvaxTTd4zxq8Mskp3uwtkqPcQJDSQaZYv+wtuB6m6vHBCOTZwAognDGEvvCg0dgTU4hch1zoHSaxedS1UFHjUAM598iuI3+hMos/5hjG/vuay4cPLBJX5x1YF6blbFALwrQw8ZmTPaimqDUA9WD6KSmS1qg4rOkk4cszIfJ5vyymMrG+G3qk5LeT4VrgIgWQTAHyXw==
           groups:
-          - ${_param:cluster_name}-core
-          - ${_param:cluster_name}-release
+          - devops-core
+          - devops-release
         fpytloun:
           fullname: Filip Pytloun
           email: "fpytloun@mirantis.com"
-          http_password: password
           ssh_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCcuHTjJ3CoWdkmvtag07bIWeyAMqFLAN+QApat7TXUcDYmm/neK4Asg3m/UicofZnB80cI4tjnB84Z8WazLHMxVTLwHbEqTVbXVeKebiZ5yn0yo4ndRzmppUfSvs0xcMysBwu+hYAnIDXTedctbciMSYKbuQ+b9XZ4mFZ/2RHG4QBA/dPUxJdCwvkBu7AOV+6zaRSR99UETr5nxICQUGVJBTy6VkCsch4mK3/K2SrujODUhytcROg+6ejV/aZHWH9xIFRBLfhmSFeOC6oneBWo4QBQ2tTZgb7Go744JpkhkoMfWQnR2s6cCgUN60BJ6j5snqmbv9/2CmgbI4UprC+E6lL04K/Jbgjv+fi3KqnCIpRiQzahmjSeeYdPducWme3BVDceUSb5EzF/RjSDi4yHcTWJS0TcPf195p42O1G6tLw5zfmIu2+PWUq1L4pLualboUbaDtwqg0WaLWKONi9tJkOS1OMz4hxqEbWBAtFNJLHC5K+OXcV8Yt6C7iB2dEZ4c26MAi1pdMqhFjxYiCGYKZ4lyV9xo8tWcs5fiUIi2PKyLQ9SMRQbhXIcb9ENby2D/ijh5AVpbBew8iaUQQKg83Yo0z2PwTWyNFuXECAl667XaTNZEMVUjo5yU/OtktVZiH6ZfvEFwj+7OpLBiZ3sFgp/7EHcGXa0FL6BcXuwfQ==
           groups:
-          - ${_param:cluster_name}-core
-          - ${_param:cluster_name}-release
+          - devops-core
+          - devops-release