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