diff --git a/ceilometer/server/backend/gnocchi.yml b/ceilometer/server/backend/gnocchi.yml
index 723d58c..6ebf45f 100644
--- a/ceilometer/server/backend/gnocchi.yml
+++ b/ceilometer/server/backend/gnocchi.yml
@@ -22,3 +22,19 @@
           enabled: true
           url: "notifier://?topic=${_param:openstack_event_alarm_topic}"
           publish_event: true
+  # default permissions in panko configuration files and ssl certificates are restricted
+  # to panko group, therefore ceilometer must have those permission to have ability to
+  # connect to panko's backend db
+  linux:
+    system:
+      group:
+        panko:
+          enabled: true
+      user:
+        ceilometer:
+          enabled: true
+          name: 'ceilometer'
+          home: '/var/lib/ceilometer'
+          shell: '/bin/false'
+          groups:
+            - 'panko'
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index 331bd7e..ba6e150 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -132,6 +132,7 @@
                 type: string
                 default: "{{stack_cleanup_job}}"
               # salt
+              # FIXME allign to DISTRIB_REVISION
               FORMULA_PKG_REVISION:
                 type: string
                 description: Version of formulas for salt-master bootstrap
diff --git a/jenkins/client/job/oscore/salt_virtual_models.yml b/jenkins/client/job/oscore/salt_virtual_models.yml
index 7bffaf2..0088fbd 100644
--- a/jenkins/client/job/oscore/salt_virtual_models.yml
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -55,6 +55,7 @@
               type: boolean
               default: 'false'
               description: "Enable it when stack have to be deleted."
+            # FIXME allign to DISTRIB_REVISION
             FORMULA_PKG_REVISION:
               type: string
               description: Version of formulas for salt-master bootstrap
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index c082306..650e1de 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -70,6 +70,7 @@
                 type: text
                 default: ""
                 description: YAML with overrides for Salt deployment
+              # FIXME allign to DISTRIB_REVISION
               FORMULA_PKG_REVISION:
                 type: string
                 description: Version of formulas for salt-master bootstrap
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 73f815d..c768fb4 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -26,14 +26,15 @@
               # Cookiecutter
               COOKIECUTTER_TEMPLATE_CONTEXT:
                 type: text
-
               # Other
               EMAIL_ADDRESS:
                 type: string
               TEST_MODEL:
                 type: boolean
                 default: true
-              RECLASS_VERSION:
+              DISTRIB_REVISION:
                 type: string
-                default: 'v1.5.4'
-                description: "Version (branch) of Reclass we will use.pip+git package"
+                default: 'proposed'
+                description: |-
+                    "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
+
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index ec0792e..3ec8300 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -51,9 +51,6 @@
               FORMULAS_SOURCE:
                 type: string
                 default: "{{formulas_src}}"
-              FORMULAS_REVISION:
-                type: string
-                default: "{{formulas_revision}}"
               SYSTEM_GIT_URL:
                 type: string
                 default: ""
@@ -63,9 +60,9 @@
               CONFIG_NODE_NAME_PATTERN:
                 type: string
                 default: "{{config_node_name}}"
-              RECLASS_VERSION:
+              DISTRIB_REVISION:
                 type: string
-                default: "master"
+                default: "{{distrib_revision}}"
               MAX_CPU_PER_JOB:
                 type: string
                 default: "2"
@@ -157,9 +154,11 @@
               FORMULAS_SOURCE:
                 type: string
                 default: "{{formulas_src}}"
-              FORMULAS_REVISION:
+              DISTRIB_REVISION:
                 type: string
-                default: "{{formulas_revision}}"
+                default: "{{distrib_revision}}"
+                description: |-
+                    "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
               SYSTEM_GIT_URL:
                 type: string
                 default: ""
@@ -175,10 +174,6 @@
               RECLASS_IGNORE_CLASS_NOTFOUND:
                 type: boolean
                 default: "{{reclass_ignore_class_notfound}}"
-              RECLASS_VERSION:
-                type: string
-                default: "master"
-                description: "Version (branch) of Reclass we will use"
               LEGACY_TEST_MODE:
                 type: boolean
                 default: "{{legacy_test_mode}}"
@@ -290,11 +285,8 @@
               DISTRIB_REVISION:
                 type: string
                 default: 'nightly'
-                description: "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env"
-              RECLASS_VERSION:
-                type: string
-                default: 'v1.5.4'
-                description: "Version (branch) of reclass PACKAGE we will use"
+                description: |-
+                    "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
               CREDENTIALS_ID:
                 type: string
                 default: gerrit
@@ -343,23 +335,17 @@
             FORMULAS_SOURCE:
               type: string
               default: "pkg"
-            FORMULAS_REVISION:
-              type: string
-              default: "stable"
             SYSTEM_GIT_URL:
               type: string
               default: ""
             SYSTEM_GIT_REF:
               type: string
               default: ""
-            RECLASS_VERSION:
+            DISTRIB_REVISION:
               type: string
-              # In our repos the latest reclass we using is 1.4.1. The new version 1.5.2 is not compatible
-              # by syntax with 1.4.1 more details may be found here PROD-20425.
-              # Run rendering tests against version we using on customer side, until new version of reclass is
-              # packaged and placed to our repos, so we can do smooth transition to new syntax.
-              default: "reclass-1.4.1"
-              description: "Version (branch) of Reclass we will use"
+              default: 'stable'
+              description: |-
+                  "Those variable will be ignored, in case gerritTrigger=>GERRIT_BRANCH. Version of bin-artifacts,passed to test-env.Includes formula/reclass/ubuntu"
             MAX_CPU_PER_JOB:
               type: string
               default: "2"
diff --git a/openssh/server/team/members/osavatieiev.yml b/openssh/server/team/members/osavatieiev.yml
new file mode 100644
index 0000000..54411f3
--- /dev/null
+++ b/openssh/server/team/members/osavatieiev.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        osavatieiev:
+          enabled: true
+          name: osavatieiev
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Alex Savatieiev
+          home: /home/osavatieiev
+          email: osavatieiev@mirantis.com
+  openssh:
+    server:
+      user:
+        osavatieiev:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1LOY6PdhYlueDeIx2ASl+56z+eUGqYXA2Aqep5W5j68W7ZRB0lmuam2Bqh5WVRP14l2pTQrV9CsCd8G1Y4nQamAwIb86ipf+8KKEawVaeWjihcUQf5VVwKIZEeZEwdHJFk5wK9YfmICn2x6rhKlQJ5ibcHpHlhdOgoscxvHMixzVxLGeRVyGn3OOeiGCEF+Ltt/ug1vj8A/9ytOCL0OMJJ9Oj8bCxrp9VQlVMAJt6Jp7iL6K8Q0J97/MZ1MehVr5RrpVf2wKNKrydfSwdqw+ZgIiQWRVl6yzv4S8AWCVhyFRMe7b1hMRpSQOqsW3oKgDyxfhc34/FFBNLOdAsQCSf osavatieiev@mirantis.com
+          user: ${linux:system:user:osavatieiev}
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 21ccba7..126a43b 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -17,6 +17,7 @@
 - system.openssh.server.team.members.yisakov
 - system.openssh.server.team.members.vblokhin
 - system.openssh.server.team.members.dstremkouski
+- system.openssh.server.team.members.osavatieiev
 - system.openssh.server.team.members.mchernik
 - system.openssh.server.team.members.hkraemer
 - system.openssh.server.team.members.pbasov
diff --git a/salt/minion/cert/barbican.yml b/salt/minion/cert/barbican.yml
index f499732..b53d07d 100644
--- a/salt/minion/cert/barbican.yml
+++ b/salt/minion/cert/barbican.yml
@@ -2,7 +2,7 @@
   _param:
     salt_minion_ca_host: kmn01.${_param:cluster_domain}
     salt_minion_ca_authority: salt_master_ca
-    barbican_cert_alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_vip_address},DNS:${linux:system:name},DNS:${linux:network:fqdn}
+    barbican_cert_alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_vip_address},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_vip_address}
   salt:
     minion:
         cert:
diff --git a/salt/minion/cert/openstack_api.yml b/salt/minion/cert/openstack_api.yml
index 1095f7e..03e8974 100644
--- a/salt/minion/cert/openstack_api.yml
+++ b/salt/minion/cert/openstack_api.yml
@@ -2,7 +2,7 @@
   _param:
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_minion_ca_authority: salt_master_ca
-    openstack_api_cert_alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_vip_address},DNS:${linux:system:name},DNS:${linux:network:fqdn}
+    openstack_api_cert_alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_vip_address},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_vip_address}
     openstack_api_cert_key_file: "/etc/ssl/private/openstack_api.key"
     openstack_api_cert_cert_file: "/etc/ssl/certs/openstack_api.crt"
     openstack_api_cert_all_file: "/etc/ssl/certs/openstack_api_with_chain.crt"