diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index dc539e8..60cfb14 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -10,25 +10,25 @@
           template:
             type: workflow-scm
             concurrent: true
-            display_name: "[MCP] Generate reclass cluster {{cookiecutter_template}}"
+            display_name: "Generate reclass cluster {{cookiecutter_template}}"
             scm:
               type: git
-              url: ${_param:jenkins_job_repository}
-              credentials: "gitlab"
-              script: metadata/cookiecutter_generate.groovy
+              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+              credentials: "jenkins-mk"
+              script: generate-cookiecutter-products.groovy
             param:
               COOKIECUTTER_TEMPLATE_URL:
                 type: string
                 default: "git@github.com:Mirantis/mk2x-cookiecutter-reclass-model.git"
               COOKIECUTTER_TEMPLATE_CREDENTIALS:
                 type: string
-                default: jenkins
+                default: github-credentials
               COOKIECUTTER_TEMPLATE_BRANCH:
                 type: string
                 default: master
-#              COOKIECUTTER_TEMPLATE_PATH:
-#                type: string
-#                default: 'cluster/{{cookiecutter_template}}'
+              COOKIECUTTER_TEMPLATE_PATH:
+                type: string
+                default: "./"
               COOKIECUTTER_INSTALL_CICD:
                 type: boolean
                 default: false
@@ -48,11 +48,10 @@
                 type: string
               RECLASS_MODEL_URL:
                 type: string
-                default: "
-                ssh://jenkins@gerrit.mcp.mirantis.net:29418/salt-models/training"
+                default: "jenkins-mk@${_param:jenkins_gerrit_url}/salt-models/training.git"
               RECLASS_MODEL_CREDENTIALS:
                 type: string
-                default: jenkins_slave
+                default: gerrit
               RECLASS_MODEL_BRANCH:
                 type: string
                 default: master
diff --git a/jenkins/client/job/salt-models/init.yml b/jenkins/client/job/salt-models/init.yml
index 9a98130..15690ea 100644
--- a/jenkins/client/job/salt-models/init.yml
+++ b/jenkins/client/job/salt-models/init.yml
@@ -1,6 +1,7 @@
 classes:
   - system.jenkins.client.job.salt-models.git-mirrors
   - system.jenkins.client.job.salt-models.tests
+  - system.jenkins.client.job.salt-models.generate
 parameters:
   _param:
     salt_formulas_branches: master
diff --git a/linux/system/repo/elasticsearch.yml b/linux/system/repo/elasticsearch.yml
index 6758f6d..60f6fd0 100644
--- a/linux/system/repo/elasticsearch.yml
+++ b/linux/system/repo/elasticsearch.yml
@@ -2,7 +2,7 @@
   linux:
     system:
       repo:
-        tcpcloud_elasticsearch:
-          source: "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial elastic"
+        elasticsearch:
+          source: "deb http://packages.elastic.co/elasticsearch/2.x/debian stable main"
           architectures: amd64
-          key_url: "http://apt.tcpcloud.eu/public.gpg"
\ No newline at end of file
+          key_url: "https://packages.elastic.co/GPG-KEY-elasticsearch"
\ No newline at end of file
diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml
index da4cddf..3dfa9f9 100644
--- a/linux/system/repo/glusterfs.yml
+++ b/linux/system/repo/glusterfs.yml
@@ -3,7 +3,7 @@
     system:
       repo:
         glusterfs-ppa:
-          source: "deb http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu trusty main"
+          source: "deb http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu ${_param:linux_system_codename} main"
           architectures: amd64
           key_id: 3FE869A9
           key_server: keyserver.ubuntu.com
\ No newline at end of file
diff --git a/reclass/storage/system/physical_control_cluster.yml b/reclass/storage/system/physical_control_cluster.yml
index 12b83c9..4622e09 100644
--- a/reclass/storage/system/physical_control_cluster.yml
+++ b/reclass/storage/system/physical_control_cluster.yml
@@ -1,57 +1,57 @@
 parameters:
   _param:
-    infra_compute_node01_hostname: kvm01
-    infra_compute_node02_hostname: kvm02
-    infra_compute_node03_hostname: kvm03
+    infra_kvm_node01_hostname: kvm01
+    infra_kvm_node02_hostname: kvm02
+    infra_kvm_node03_hostname: kvm03
 
-    infra_compute_node01_deploy_address: ${_param:infra_compute_node01_address}
-    infra_compute_node02_deploy_address: ${_param:infra_compute_node02_address}
-    infra_compute_node03_deploy_address: ${_param:infra_compute_node03_address}
+    infra_kvm_node01_deploy_address: ${_param:infra_kvm_node01_address}
+    infra_kvm_node02_deploy_address: ${_param:infra_kvm_node02_address}
+    infra_kvm_node03_deploy_address: ${_param:infra_kvm_node03_address}
 
-    infra_compute_node01_storage_address: ${_param:infra_compute_node01_address}
-    infra_compute_node02_storage_address: ${_param:infra_compute_node02_address}
-    infra_compute_node03_storage_address: ${_param:infra_compute_node03_address}
+    infra_kvm_node01_storage_address: ${_param:infra_kvm_node01_address}
+    infra_kvm_node02_storage_address: ${_param:infra_kvm_node02_address}
+    infra_kvm_node03_storage_address: ${_param:infra_kvm_node03_address}
 
-    infra_compute_node01_public_address: ${_param:infra_compute_node01_address}
-    infra_compute_node02_public_address: ${_param:infra_compute_node02_address}
-    infra_compute_node03_public_address: ${_param:infra_compute_node03_address}
+    infra_kvm_node01_public_address: ${_param:infra_kvm_node01_address}
+    infra_kvm_node02_public_address: ${_param:infra_kvm_node02_address}
+    infra_kvm_node03_public_address: ${_param:infra_kvm_node03_address}
 
   reclass:
     storage:
       node:
-        infra_compute_node01:
-          name: ${_param:infra_compute_node01_hostname}
+        infra_kvm_node01:
+          name: ${_param:infra_kvm_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node01_address}
-            deploy_address: ${_param:infra_compute_node01_deploy_address}
-            public_address: ${_param:infra_compute_node01_public_address}
-            storage_address: ${_param:infra_compute_node01_storage_address}
-        infra_compute_node02:
-          name: ${_param:infra_compute_node02_hostname}
+            single_address: ${_param:infra_kvm_node01_address}
+            deploy_address: ${_param:infra_kvm_node01_deploy_address}
+            public_address: ${_param:infra_kvm_node01_public_address}
+            storage_address: ${_param:infra_kvm_node01_storage_address}
+        infra_kvm_node02:
+          name: ${_param:infra_kvm_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node02_address}
-            deploy_address: ${_param:infra_compute_node02_deploy_address}
-            public_address: ${_param:infra_compute_node02_public_address}
-            storage_address: ${_param:infra_compute_node02_storage_address}
-        infra_compute_node03:
-          name: ${_param:infra_compute_node03_hostname}
+            single_address: ${_param:infra_kvm_node02_address}
+            deploy_address: ${_param:infra_kvm_node02_deploy_address}
+            public_address: ${_param:infra_kvm_node02_public_address}
+            storage_address: ${_param:infra_kvm_node02_storage_address}
+        infra_kvm_node03:
+          name: ${_param:infra_kvm_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node03_address}
-            deploy_address: ${_param:infra_compute_node03_deploy_address}
-            public_address: ${_param:infra_compute_node03_public_address}
-            storage_address: ${_param:infra_compute_node03_storage_address}
+            single_address: ${_param:infra_kvm_node03_address}
+            deploy_address: ${_param:infra_kvm_node03_deploy_address}
+            public_address: ${_param:infra_kvm_node03_public_address}
+            storage_address: ${_param:infra_kvm_node03_storage_address}
diff --git a/reclass/storage/system/physical_control_full.yml b/reclass/storage/system/physical_control_full.yml
index 7591113..0f510a4 100644
--- a/reclass/storage/system/physical_control_full.yml
+++ b/reclass/storage/system/physical_control_full.yml
@@ -1,153 +1,153 @@
 parameters:
   _param:
-    infra_compute_node01_hostname: kvm01
-    infra_compute_node02_hostname: kvm02
-    infra_compute_node03_hostname: kvm03
-    infra_compute_node04_hostname: kvm04
-    infra_compute_node05_hostname: kvm05
-    infra_compute_node06_hostname: kvm06
-    infra_compute_node07_hostname: kvm07
-    infra_compute_node08_hostname: kvm08
-    infra_compute_node09_hostname: kvm09
+    infra_kvm_node01_hostname: kvm01
+    infra_kvm_node02_hostname: kvm02
+    infra_kvm_node03_hostname: kvm03
+    infra_kvm_node04_hostname: kvm04
+    infra_kvm_node05_hostname: kvm05
+    infra_kvm_node06_hostname: kvm06
+    infra_kvm_node07_hostname: kvm07
+    infra_kvm_node08_hostname: kvm08
+    infra_kvm_node09_hostname: kvm09
 
-    infra_compute_node01_deploy_address: ${_param:infra_compute_node01_address}
-    infra_compute_node02_deploy_address: ${_param:infra_compute_node02_address}
-    infra_compute_node03_deploy_address: ${_param:infra_compute_node03_address}
-    infra_compute_node04_deploy_address: ${_param:infra_compute_node04_address}
-    infra_compute_node05_deploy_address: ${_param:infra_compute_node05_address}
-    infra_compute_node06_deploy_address: ${_param:infra_compute_node06_address}
-    infra_compute_node07_deploy_address: ${_param:infra_compute_node07_address}
-    infra_compute_node08_deploy_address: ${_param:infra_compute_node08_address}
-    infra_compute_node09_deploy_address: ${_param:infra_compute_node09_address}
+    infra_kvm_node01_deploy_address: ${_param:infra_kvm_node01_address}
+    infra_kvm_node02_deploy_address: ${_param:infra_kvm_node02_address}
+    infra_kvm_node03_deploy_address: ${_param:infra_kvm_node03_address}
+    infra_kvm_node04_deploy_address: ${_param:infra_kvm_node04_address}
+    infra_kvm_node05_deploy_address: ${_param:infra_kvm_node05_address}
+    infra_kvm_node06_deploy_address: ${_param:infra_kvm_node06_address}
+    infra_kvm_node07_deploy_address: ${_param:infra_kvm_node07_address}
+    infra_kvm_node08_deploy_address: ${_param:infra_kvm_node08_address}
+    infra_kvm_node09_deploy_address: ${_param:infra_kvm_node09_address}
 
-    infra_compute_node01_storage_address: ${_param:infra_compute_node01_address}
-    infra_compute_node02_storage_address: ${_param:infra_compute_node02_address}
-    infra_compute_node03_storage_address: ${_param:infra_compute_node03_address}
-    infra_compute_node04_storage_address: ${_param:infra_compute_node04_address}
-    infra_compute_node05_storage_address: ${_param:infra_compute_node05_address}
-    infra_compute_node06_storage_address: ${_param:infra_compute_node06_address}
-    infra_compute_node07_storage_address: ${_param:infra_compute_node07_address}
-    infra_compute_node08_storage_address: ${_param:infra_compute_node08_address}
-    infra_compute_node09_storage_address: ${_param:infra_compute_node09_address}
+    infra_kvm_node01_storage_address: ${_param:infra_kvm_node01_address}
+    infra_kvm_node02_storage_address: ${_param:infra_kvm_node02_address}
+    infra_kvm_node03_storage_address: ${_param:infra_kvm_node03_address}
+    infra_kvm_node04_storage_address: ${_param:infra_kvm_node04_address}
+    infra_kvm_node05_storage_address: ${_param:infra_kvm_node05_address}
+    infra_kvm_node06_storage_address: ${_param:infra_kvm_node06_address}
+    infra_kvm_node07_storage_address: ${_param:infra_kvm_node07_address}
+    infra_kvm_node08_storage_address: ${_param:infra_kvm_node08_address}
+    infra_kvm_node09_storage_address: ${_param:infra_kvm_node09_address}
 
-    infra_compute_node01_public_address: ${_param:infra_compute_node01_address}
-    infra_compute_node02_public_address: ${_param:infra_compute_node02_address}
-    infra_compute_node03_public_address: ${_param:infra_compute_node03_address}
-    infra_compute_node04_public_address: ${_param:infra_compute_node04_address}
-    infra_compute_node05_public_address: ${_param:infra_compute_node05_address}
-    infra_compute_node06_public_address: ${_param:infra_compute_node06_address}
-    infra_compute_node07_public_address: ${_param:infra_compute_node07_address}
-    infra_compute_node08_public_address: ${_param:infra_compute_node08_address}
-    infra_compute_node09_public_address: ${_param:infra_compute_node09_address}
+    infra_kvm_node01_public_address: ${_param:infra_kvm_node01_address}
+    infra_kvm_node02_public_address: ${_param:infra_kvm_node02_address}
+    infra_kvm_node03_public_address: ${_param:infra_kvm_node03_address}
+    infra_kvm_node04_public_address: ${_param:infra_kvm_node04_address}
+    infra_kvm_node05_public_address: ${_param:infra_kvm_node05_address}
+    infra_kvm_node06_public_address: ${_param:infra_kvm_node06_address}
+    infra_kvm_node07_public_address: ${_param:infra_kvm_node07_address}
+    infra_kvm_node08_public_address: ${_param:infra_kvm_node08_address}
+    infra_kvm_node09_public_address: ${_param:infra_kvm_node09_address}
 
   reclass:
     storage:
       node:
-        infra_compute_node01:
-          name: ${_param:infra_compute_node01_hostname}
+        infra_kvm_node01:
+          name: ${_param:infra_kvm_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node01_address}
-            deploy_address: ${_param:infra_compute_node01_deploy_address}
-            public_address: ${_param:infra_compute_node01_public_address}
-            storage_address: ${_param:infra_compute_node01_storage_address}
-        infra_compute_node02:
-          name: ${_param:infra_compute_node02_hostname}
+            single_address: ${_param:infra_kvm_node01_address}
+            deploy_address: ${_param:infra_kvm_node01_deploy_address}
+            public_address: ${_param:infra_kvm_node01_public_address}
+            storage_address: ${_param:infra_kvm_node01_storage_address}
+        infra_kvm_node02:
+          name: ${_param:infra_kvm_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node02_address}
-            deploy_address: ${_param:infra_compute_node02_deploy_address}
-            public_address: ${_param:infra_compute_node02_public_address}
-            storage_address: ${_param:infra_compute_node02_storage_address}
-        infra_compute_node03:
-          name: ${_param:infra_compute_node03_hostname}
+            single_address: ${_param:infra_kvm_node02_address}
+            deploy_address: ${_param:infra_kvm_node02_deploy_address}
+            public_address: ${_param:infra_kvm_node02_public_address}
+            storage_address: ${_param:infra_kvm_node02_storage_address}
+        infra_kvm_node03:
+          name: ${_param:infra_kvm_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node03_address}
-            deploy_address: ${_param:infra_compute_node03_deploy_address}
-            public_address: ${_param:infra_compute_node03_public_address}
-            storage_address: ${_param:infra_compute_node03_storage_address}
-        infra_compute_node04:
-          name: ${_param:infra_compute_node04_hostname}
+            single_address: ${_param:infra_kvm_node03_address}
+            deploy_address: ${_param:infra_kvm_node03_deploy_address}
+            public_address: ${_param:infra_kvm_node03_public_address}
+            storage_address: ${_param:infra_kvm_node03_storage_address}
+        infra_kvm_node04:
+          name: ${_param:infra_kvm_node04_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node04_address}
-            deploy_address: ${_param:infra_compute_node04_deploy_address}
-            public_address: ${_param:infra_compute_node04_public_address}
-            storage_address: ${_param:infra_compute_node04_storage_address}
-        infra_compute_node05:
-          name: ${_param:infra_compute_node05_hostname}
+            single_address: ${_param:infra_kvm_node04_address}
+            deploy_address: ${_param:infra_kvm_node04_deploy_address}
+            public_address: ${_param:infra_kvm_node04_public_address}
+            storage_address: ${_param:infra_kvm_node04_storage_address}
+        infra_kvm_node05:
+          name: ${_param:infra_kvm_node05_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node05_address}
-            deploy_address: ${_param:infra_compute_node05_deploy_address}
-            public_address: ${_param:infra_compute_node05_public_address}
-            storage_address: ${_param:infra_compute_node05_storage_address}
-        infra_compute_node06:
-          name: ${_param:infra_compute_node06_hostname}
+            single_address: ${_param:infra_kvm_node05_address}
+            deploy_address: ${_param:infra_kvm_node05_deploy_address}
+            public_address: ${_param:infra_kvm_node05_public_address}
+            storage_address: ${_param:infra_kvm_node05_storage_address}
+        infra_kvm_node06:
+          name: ${_param:infra_kvm_node06_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node06_address}
-            deploy_address: ${_param:infra_compute_node06_deploy_address}
-            public_address: ${_param:infra_compute_node06_public_address}
-            storage_address: ${_param:infra_compute_node06_storage_address}
-        infra_compute_node07:
-          name: ${_param:infra_compute_node07_hostname}
+            single_address: ${_param:infra_kvm_node06_address}
+            deploy_address: ${_param:infra_kvm_node06_deploy_address}
+            public_address: ${_param:infra_kvm_node06_public_address}
+            storage_address: ${_param:infra_kvm_node06_storage_address}
+        infra_kvm_node07:
+          name: ${_param:infra_kvm_node07_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node07_address}
-            deploy_address: ${_param:infra_compute_node07_deploy_address}
-            public_address: ${_param:infra_compute_node07_public_address}
-            storage_address: ${_param:infra_compute_node07_storage_address}
-        infra_compute_node08:
-          name: ${_param:infra_compute_node08_hostname}
+            single_address: ${_param:infra_kvm_node07_address}
+            deploy_address: ${_param:infra_kvm_node07_deploy_address}
+            public_address: ${_param:infra_kvm_node07_public_address}
+            storage_address: ${_param:infra_kvm_node07_storage_address}
+        infra_kvm_node08:
+          name: ${_param:infra_kvm_node08_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node08_address}
-            deploy_address: ${_param:infra_compute_node08_deploy_address}
-            public_address: ${_param:infra_compute_node08_public_address}
-            storage_address: ${_param:infra_compute_node08_storage_address}
-        infra_compute_node09:
-          name: ${_param:infra_compute_node09_hostname}
+            single_address: ${_param:infra_kvm_node08_address}
+            deploy_address: ${_param:infra_kvm_node08_deploy_address}
+            public_address: ${_param:infra_kvm_node08_public_address}
+            storage_address: ${_param:infra_kvm_node08_storage_address}
+        infra_kvm_node09:
+          name: ${_param:infra_kvm_node09_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node09_address}
-            deploy_address: ${_param:infra_compute_node09_deploy_address}
-            public_address: ${_param:infra_compute_node09_public_address}
-            storage_address: ${_param:infra_compute_node09_storage_address}
\ No newline at end of file
+            single_address: ${_param:infra_kvm_node09_address}
+            deploy_address: ${_param:infra_kvm_node09_deploy_address}
+            public_address: ${_param:infra_kvm_node09_public_address}
+            storage_address: ${_param:infra_kvm_node09_storage_address}
diff --git a/reclass/storage/system/physical_control_single.yml b/reclass/storage/system/physical_control_single.yml
index 1a604f1..32f09c3 100644
--- a/reclass/storage/system/physical_control_single.yml
+++ b/reclass/storage/system/physical_control_single.yml
@@ -1,21 +1,21 @@
 parameters:
   _param:
-    infra_compute_node01_hostname: kvm01
-    infra_compute_node01_deploy_address: ${_param:infra_compute_node01_address}
-    infra_compute_node01_storage_address: ${_param:infra_compute_node01_address}
-    infra_compute_node01_public_address: ${_param:infra_compute_node01_address}
+    infra_kvm_node01_hostname: kvm01
+    infra_kvm_node01_deploy_address: ${_param:infra_kvm_node01_address}
+    infra_kvm_node01_storage_address: ${_param:infra_kvm_node01_address}
+    infra_kvm_node01_public_address: ${_param:infra_kvm_node01_address}
   reclass:
     storage:
       node:
-        infra_compute_node01:
-          name: ${_param:infra_compute_node01_hostname}
+        infra_kvm_node01:
+          name: ${_param:infra_kvm_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.infra.kvm
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:infra_compute_node01_address}
-            deploy_address: ${_param:infra_compute_node01_deploy_address}
-            public_address: ${_param:infra_compute_node01_public_address}
-            storage_address: ${_param:infra_compute_node01_storage_address}
\ No newline at end of file
+            single_address: ${_param:infra_kvm_node01_address}
+            deploy_address: ${_param:infra_kvm_node01_deploy_address}
+            public_address: ${_param:infra_kvm_node01_public_address}
+            storage_address: ${_param:infra_kvm_node01_storage_address}