diff --git a/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml b/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
index 1c1bd8d..41729bd 100644
--- a/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
+++ b/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
@@ -88,6 +88,7 @@ Methods:
               ldap => $this.ldap)
 
       # Jenkins
+      # set user and mail for accessing to Gerrit from Jenkins
       - If: $this.jenkins = null
         Then:
           - $._environment.reporter.report($this,
@@ -105,7 +106,9 @@ Methods:
               name => 'Jenkins',
               instance => $jenkinsInstance,
               ldap => $this.ldap,
-              cfplugin => false)
+              cfplugin => false,
+              gitUser => $user,
+              gitEmail => $mail)
 
       # Deploy all
       - Parallel:
diff --git a/murano-apps/Jenkins/package/Classes/Jenkins.yaml b/murano-apps/Jenkins/package/Classes/Jenkins.yaml
index 570886b..f7d7d01 100644
--- a/murano-apps/Jenkins/package/Classes/Jenkins.yaml
+++ b/murano-apps/Jenkins/package/Classes/Jenkins.yaml
@@ -137,21 +137,8 @@ Methods:
       - gitEmail:
           Contract: $.string()
     Body:
-      # Set defaults if not provided.
-      - If: $gitUser in ['', null]
-        Then:
-          - $gitUsername: 'user'
-        Else:
-          - $gitUsername: $gitUser
-
-      - If: $gitEmail in ['', null]
-        Then:
-          - $gitUserEmail: 'user@mirantis.test'
-        Else:
-          - $gitUserEmail: $gitEmail
-
-      - $.instance.setHieraValue('git_user', $gitUsername)
-      - $.instance.setHieraValue('git_user_email', $gitUserEmail)
+      - $.instance.setHieraValue('git_user', $gitUser)
+      - $.instance.setHieraValue('git_user_email', $gitEmail)
       - $resources: new(sys:Resources)
       - $._environment.reporter.report($this, 'Configure Jenkins Git plugin...')
       - $template: $resources.yaml('ConfigureGit.template')