diff --git a/.releasenotes/config.yaml b/.releasenotes/config.yaml
new file mode 100644
index 0000000..28db76e
--- /dev/null
+++ b/.releasenotes/config.yaml
@@ -0,0 +1,58 @@
+---
+# Usage:
+#
+# reno -qd .releasenotes list
+# reno -qd .releasenotes new slug-title --edit
+# reno -qd .releasenotes report --no-show-source
+
+# Change prelude_section_name to 'summary' from default value prelude
+prelude_section_name: summary
+show_source: False
+sections:
+  - [features, New Features]
+  - [upgrade, Upgrade Notes]
+  - [fixes, Bug Fixes]
+  - [other, Other Notes]
+template: |
+  ---
+  # Author the following sections or remove the section if it is not related.
+  # Use one release note per a feature.
+  #
+  # If you miss a section from the list below, please first submit a review
+  # adding it to .releasenotes/config.yaml.
+  #
+  summary: >
+    This section is not mandatory. Use it to highlight the change.
+
+  features:
+    - Use list to record summary of features.
+    - |
+      Provide detailed description with examples.
+      Format with reStructuredText.
+
+      .. code-block:: text
+
+         provide model/formula pillar snippets
+
+  upgrade:
+    - |
+      Document how to use a feature and related upgrade instructions.
+
+  fixes:
+    - Use list to record summary of fixes.
+      Quick and dirty `git log --oneline`.
+
+  other:
+    - Author additional notes for the release.
+    - Format with reStructuredText.
+    - |
+        Use this section if note is not related to one of the common sections:
+        features, issues, upgrade, deprecations, security, fixes, api, cli
+
+        * list item 1
+        * list item 2
+
+        .. code-block:: yaml
+
+          classes:
+          - system.class.to.load
diff --git a/.releasenotes/notes/add-releasenotes-20cce0cea873f011.yaml b/.releasenotes/notes/add-releasenotes-20cce0cea873f011.yaml
new file mode 100644
index 0000000..733776f
--- /dev/null
+++ b/.releasenotes/notes/add-releasenotes-20cce0cea873f011.yaml
@@ -0,0 +1,18 @@
+---
+summary: >
+  Use "reno", an releasenotes configuration tool to record release notes.
+  Documentation: https://docs.openstack.org/reno/latest
+
+  Example usage:
+
+  .. code-block:: shell
+
+    # to list/create/show release notes, run following commands
+    reno -qd .releasenotes list
+    reno -qd .releasenotes new releasenote-slug-title --edit
+    reno -qd .releasenotes report --no-show-source
+
+other:
+  - |
+    Added `reno <https://docs.openstack.org/reno/latest>_` configuration to track release notes
+    within the reclass-system git repository.
diff --git a/artifactory/client/init.yml b/artifactory/client/init.yml
index 9aea48b..0148879 100644
--- a/artifactory/client/init.yml
+++ b/artifactory/client/init.yml
@@ -9,6 +9,10 @@
           port: ${_param:artifactory_server_port}
           user: ${_param:artifactory_client_user}
           password: ${_param:artifactory_client_password}
+          license_key: ${_param:artifactory_license_key}
+          ldap_server: ${_param:artifactory_security_ldap_server}
+          ldap_account_base: ${_param:artifactory_security_ldap_root_dn}
+          ldap_searchFilter: ${_param:artifactory_security_ldap_searchFilter}
           ssl_verify: False
         repo:
           local_artifactory_repo:
diff --git a/designate/server/backend/bind.yml b/designate/server/backend/bind.yml
index c057eb7..4201f60 100644
--- a/designate/server/backend/bind.yml
+++ b/designate/server/backend/bind.yml
@@ -1,3 +1,5 @@
+classes:
+- service.bind.server.single
 parameters:
   _param:
     designate_bind9_rndc_algorithm: hmac-sha512
@@ -19,7 +21,7 @@
         local:
           enabled: true
           bind:
-            address: 127.0.0.1
+            address: ${_param:single_address}
             port: 953
           allow:
             - 127.0.0.1
@@ -30,7 +32,7 @@
       enabled: true
       option:
         default:
-          server: 127.0.0.1
+          server: ${_param:single_address}
           port: 953
           key: designate
       key:
diff --git a/docker/swarm/manager.yml b/docker/swarm/manager.yml
index 25a7fbe..12bfc0c 100644
--- a/docker/swarm/manager.yml
+++ b/docker/swarm/manager.yml
@@ -3,9 +3,11 @@
 parameters:
   _param:
     docker_gwbridge_subnet: 10.20.0.0/16
+    docker_swarm_master_port: 2377
   docker:
     swarm:
       role: manager
       advertise_addr: ${_param:single_address}
       master:
         host: ${_param:cluster_node01_address}
+        port: ${_param:docker_swarm_master_port}
diff --git a/docker/swarm/stack/influxdb.yml b/docker/swarm/stack/influxdb.yml
index e753d18..f9b1f58 100644
--- a/docker/swarm/stack/influxdb.yml
+++ b/docker/swarm/stack/influxdb.yml
@@ -5,7 +5,7 @@
 parameters:
   _param:
     docker_influxdb_replicas: 1
-    docker_influxdb_data_dir: /srv/volumes/influxdb
+    docker_influxdb_dir: /srv/volumes/influxdb
   docker:
     client:
       stack:
@@ -19,11 +19,12 @@
               environment:
                 INFLUXDB_CONFIG_PATH: /etc/influxdb/influxdb.conf
                 INFLUXDB_DATA_DIR: /var/lib/influxdb/data
-                INFLUXDB_DATA_WAL_DIR: /var/lib/influxdb/wal
+                INFLUXDB_META_DIR: /var/lib/influxdb/meta
+                INFLUXDB_DATA_WAL_DIR: /tmp/wal
               image: ${_param:docker_influxdb_image}
               ports:
               - 15016:8086
               volumes:
               - ${influxdb:server:prefix_dir}/etc/influxdb:/etc/influxdb
-              - ${_param:docker_influxdb_data_dir}:/var/lib/influxdb/data
-              - ${influxdb:server:data:wal_dir}:/var/lib/influxdb/wal
+              - ${_param:docker_influxdb_dir}:/var/lib/influxdb
+              - ${influxdb:server:data:wal_dir}:/tmp/wal
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index d851962..bc01e92 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    docker_image_jenkins: tcpcloud/jenkins:2.63
+    docker_image_jenkins: tcpcloud/jenkins:2.71
     jenkins_master_extra_opts: ""
     jenkins_master_executors_num: 4
   docker:
@@ -10,7 +10,7 @@
           service:
             master:
               environment:
-                JAVA_OPTS: " -server -XX:+AlwaysPreTouch -Xloggc:$JENKINS_HOME/gc-%t.log -XX:NumberOfGCLogFiles=5 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=20m -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=20 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1-Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com ${_param:jenkins_master_extra_opts}"
+                JAVA_OPTS: " -server -XX:+AlwaysPreTouch -Xloggc:$JENKINS_HOME/gc-%t.log -XX:NumberOfGCLogFiles=5 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=20m -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=20 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1 -Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com ${_param:jenkins_master_extra_opts}"
                 JENKINS_NUM_EXECUTORS: ${_param:jenkins_master_executors_num}
               deploy:
                 restart_policy:
diff --git a/docker/swarm/stack/monitoring/init.yml b/docker/swarm/stack/monitoring/init.yml
index 97b9ac3..347319a 100644
--- a/docker/swarm/stack/monitoring/init.yml
+++ b/docker/swarm/stack/monitoring/init.yml
@@ -32,6 +32,7 @@
               environment:
                 bind_port: ${prometheus:remote_storage_adapter:bind:port}
                 bind_address: ${prometheus:remote_storage_adapter:bind:address}
+                influxdb_retention_policy: 'lma'
                 influxdb_url: ${_param:prometheus_influxdb_url}
                 influxdb_db: ${_param:prometheus_influxdb_db}
                 influxdb_username: ${_param:prometheus_influxdb_username}
diff --git a/docker/swarm/worker.yml b/docker/swarm/worker.yml
index 643b207..4bed790 100644
--- a/docker/swarm/worker.yml
+++ b/docker/swarm/worker.yml
@@ -3,9 +3,11 @@
 parameters:
   _param:
     docker_gwbridge_subnet: 10.20.0.0/16
+    docker_swarm_master_port: 2377
   docker:
     swarm:
       role: worker
       advertise_addr: ${_param:single_address}
       master:
         host: ${_param:cluster_node01_address}
+        port: ${_param:docker_swarm_master_port}
diff --git a/haproxy/proxy/listen/cicd/aptly.yml b/haproxy/proxy/listen/cicd/aptly.yml
index fb24c1f..35ae3d6 100644
--- a/haproxy/proxy/listen/cicd/aptly.yml
+++ b/haproxy/proxy/listen/cicd/aptly.yml
@@ -14,6 +14,9 @@
             - httpclose
             - httplog
           balance: source
+          timeout:
+            server: 10m
+            client: 10m
           binds:
             - address: ${_param:haproxy_aptly_api_bind_host}
               port: ${_param:haproxy_aptly_api_bind_port}
diff --git a/haproxy/proxy/listen/kubernetes/apiserver.yml b/haproxy/proxy/listen/kubernetes/apiserver.yml
index b35d1be..8dfcb35 100644
--- a/haproxy/proxy/listen/kubernetes/apiserver.yml
+++ b/haproxy/proxy/listen/kubernetes/apiserver.yml
@@ -12,15 +12,15 @@
           servers:
           - name: ${_param:cluster_node01_hostname}
             host: ${_param:cluster_node01_address}
-            port: 443
+            port: 6443
             params: check
           - name: ${_param:cluster_node02_hostname}
             host: ${_param:cluster_node02_address}
-            port: 443
+            port: 6443
             params: check
           - name: ${_param:cluster_node03_hostname}
             host: ${_param:cluster_node03_address}
-            port: 443
+            port: 6443
             params: check
           timeout:
             server: 10m
diff --git a/haproxy/proxy/listen/openstack/keystone.yml b/haproxy/proxy/listen/openstack/keystone/init.yml
similarity index 90%
rename from haproxy/proxy/listen/openstack/keystone.yml
rename to haproxy/proxy/listen/openstack/keystone/init.yml
index 17e537e..4359f60 100644
--- a/haproxy/proxy/listen/openstack/keystone.yml
+++ b/haproxy/proxy/listen/openstack/keystone/init.yml
@@ -3,8 +3,6 @@
     proxy:
       listen:
         keystone_public_api:
-          type: openstack-service
-          service_name: keystone
           binds:
           - address: ${_param:cluster_vip_address}
             port: 5000
@@ -22,8 +20,6 @@
             port: 5000
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
         keystone_admin_api:
-          type: openstack-service
-          service_name: keystone
           binds:
           - address: ${_param:cluster_vip_address}
             port: 35357
@@ -39,4 +35,4 @@
           - name: ctl03
             host: ${_param:cluster_node03_address}
             port: 35357
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/haproxy/proxy/listen/openstack/keystone/standalone.yml b/haproxy/proxy/listen/openstack/keystone/standalone.yml
new file mode 100644
index 0000000..c454583
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/keystone/standalone.yml
@@ -0,0 +1,12 @@
+classes:
+- system.haproxy.proxy.listen.openstack.keystone
+parameters:
+  haproxy:
+    proxy:
+      listen:
+        keystone_public_api:
+          type: openstack-service
+          service_name: keystone
+        keystone_admin_api:
+          type: openstack-service
+          service_name: keystone
diff --git a/haproxy/proxy/listen/openstack/keystone/wsgi.yml b/haproxy/proxy/listen/openstack/keystone/wsgi.yml
new file mode 100644
index 0000000..efefe8b
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/keystone/wsgi.yml
@@ -0,0 +1,29 @@
+classes:
+- system.haproxy.proxy.listen.openstack.keystone
+parameters:
+  haproxy:
+    proxy:
+      listen:
+        keystone_public_api:
+          mode: http
+          options:
+            - httpchk
+            - httpclose
+            - httplog
+          sticks:
+            - stick on src
+            - stick-table type ip size 200k expire 2m
+        keystone_admin_api:
+          mode: http
+          options:
+            - httpchk
+            - httpclose
+            - httplog
+          sticks:
+            - stick on src
+            - stick-table type ip size 200k expire 2m
+          binds:
+          - address: ${_param:cluster_vip_address}
+            port: 35357
+            ssl:
+              enabled: false
diff --git a/influxdb/client/database/ceilometer.yml b/influxdb/client/database/ceilometer.yml
index 52aebae..88d6a07 100644
--- a/influxdb/client/database/ceilometer.yml
+++ b/influxdb/client/database/ceilometer.yml
@@ -8,7 +8,7 @@
           enabled: true
           name: ceilometer
           retention_policy:
-            - name: ceilometer_default
+            - name: ceilometer
               is_default: true
               duration: ${_param:influxdb_ceilometer_rp_duration}
               replication: 1
diff --git a/influxdb/client/database/prometheus.yml b/influxdb/client/database/prometheus.yml
new file mode 100644
index 0000000..991fbd2
--- /dev/null
+++ b/influxdb/client/database/prometheus.yml
@@ -0,0 +1,25 @@
+parameters:
+  _param:
+    influxdb_prometheus_rp_duration: 30d
+  influxdb:
+    client:
+      database:
+        prometheus:
+          enabled: true
+          name: prometheus
+          retention_policy:
+          - name: lma
+            is_default: true
+            duration: ${_param:influxdb_prometheus_rp_duration}
+            replication: 1
+      user:
+        lma:
+          enabled: true
+          name: lma
+          password: ${_param:influxdb_stacklight_password}
+      grant:
+        lma_all_on_prometheus:
+          enabled: true
+          user: lma
+          database: prometheus
+          privilege: all
diff --git a/influxdb/client/database/stacklight.yml b/influxdb/client/database/stacklight.yml
index d07d0b8..76b8e60 100644
--- a/influxdb/client/database/stacklight.yml
+++ b/influxdb/client/database/stacklight.yml
@@ -8,9 +8,9 @@
           enabled: true
           name: lma
           retention_policy:
-          - name: lma_default
+          - name: lma
             is_default: true
-            duration: ${_param:influxdb_stacklight_password}
+            duration: ${_param:influxdb_stacklight_rp_duration}
             replication: 1
       user:
         lma:
@@ -18,7 +18,7 @@
           name: lma
           password: ${_param:influxdb_stacklight_password}
       grant:
-        lma_all:
+        lma_all_on_lma:
           enabled: true
           user: lma
           database: lma
diff --git a/influxdb/database/prometheus.yml b/influxdb/database/prometheus.yml
new file mode 100644
index 0000000..3e3d63b
--- /dev/null
+++ b/influxdb/database/prometheus.yml
@@ -0,0 +1,25 @@
+parameters:
+  _param:
+    influxdb_prometheus_database_retention: 30d
+  influxdb:
+    server:
+      database:
+        prometheus:
+          enabled: true
+          name: prometheus
+          retention_policy:
+          - name: lma
+            is_default: true
+            duration: ${_param:influxdb_prometheus_database_retention}
+            replication: 1
+      user:
+        lma:
+          enabled: true
+          name: lma
+          password: ${_param:influxdb_stacklight_password}
+      grant:
+        grant_lma_all_on_prometheus:
+          enabled: true
+          user: lma
+          database: prometheus
+          privilege: all
diff --git a/influxdb/database/stacklight.yml b/influxdb/database/stacklight.yml
index d741380..9eb2eb0 100644
--- a/influxdb/database/stacklight.yml
+++ b/influxdb/database/stacklight.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    influxdb_lma_database_retention: 30d
   influxdb:
     server:
       database:
@@ -8,7 +10,7 @@
           retention_policy:
           - name: lma
             is_default: true
-            duration: 30d
+            duration: ${_param:influxdb_lma_database_retention}
             replication: 1
       user:
         lma:
@@ -16,7 +18,7 @@
           name: lma
           password: ${_param:influxdb_stacklight_password}
       grant:
-        grant_lma_all:
+        grant_lma_all_on_lma:
           enabled: true
           user: lma
           database: lma
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 367a800..5d9a140 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -56,6 +56,9 @@
         - method java.util.regex.Matcher matches
         - method java.util.regex.Pattern matcher java.lang.CharSequence
         - method java.util.stream.Stream collect java.util.stream.Collector
+        - method java.util.Calendar add int int
+        - method java.util.Calendar getTime
+        - method java.util.Date before java.util.Date
         - method jenkins.model.Jenkins getItemByFullName java.lang.String
         - method jenkins.model.Jenkins getPluginManager
         - method org.jenkinsci.plugins.workflow.job.WorkflowRun doStop
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 6ccb432..31b8e2a 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -213,6 +213,8 @@
               dist: xenial
             - name: avinetworks
               dist: xenial
+            - name: barbican
+              dist: xenial
             - name: baremetal-simulator
               dist: xenial
             - name: backupninja
diff --git a/jenkins/client/job/decapod/add_mon.yml b/jenkins/client/job/decapod/add_mon.yml
new file mode 100644
index 0000000..03daed2
--- /dev/null
+++ b/jenkins/client/job/decapod/add_mon.yml
@@ -0,0 +1,30 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        decapod_add_mon:
+          type: workflow-scm
+          name: decapod-add_mon
+          display_name: "Decapod - add monitors"
+          discard:
+            build:
+              keep_num: 20
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
+            credentials: "gerrit"
+            script: add-mon.groovy
+          param:
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              default: "salt"
+            SALT_MASTER_IP:
+              type: string
+              default: "${_param:infra_config_address}"
+            SALT_MASTER_PORT:
+              type: string
+              default: "${_param:salt_master_api_port}"
+            ASK_ON_ERROR:
+              type: boolean
+              default: 'false'
\ No newline at end of file
diff --git a/jenkins/client/job/decapod/add_osd.yml b/jenkins/client/job/decapod/add_osd.yml
new file mode 100644
index 0000000..f0a4333
--- /dev/null
+++ b/jenkins/client/job/decapod/add_osd.yml
@@ -0,0 +1,30 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        decapod_add_osd:
+          type: workflow-scm
+          name: decapod-add_osd
+          display_name: "Decapod - add new osd"
+          discard:
+            build:
+              keep_num: 20
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
+            credentials: "gerrit"
+            script: add-osd.groovy
+          param:
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              default: "salt"
+            SALT_MASTER_IP:
+              type: string
+              default: "${_param:infra_config_address}"
+            SALT_MASTER_PORT:
+              type: string
+              default: "${_param:salt_master_api_port}"
+            ASK_ON_ERROR:
+              type: boolean
+              default: 'false'
\ No newline at end of file
diff --git a/jenkins/client/job/decapod/del_mon.yml b/jenkins/client/job/decapod/del_mon.yml
new file mode 100644
index 0000000..d858431
--- /dev/null
+++ b/jenkins/client/job/decapod/del_mon.yml
@@ -0,0 +1,30 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        decapod_del_mon:
+          type: workflow-scm
+          name: decapod-del_mon
+          display_name: "Decapod - del monitors"
+          discard:
+            build:
+              keep_num: 20
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
+            credentials: "gerrit"
+            script: del-mon.groovy
+          param:
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              default: "salt"
+            SALT_MASTER_IP:
+              type: string
+              default: "${_param:infra_config_address}"
+            SALT_MASTER_PORT:
+              type: string
+              default: "${_param:salt_master_api_port}"
+            ASK_ON_ERROR:
+              type: boolean
+              default: 'false'
diff --git a/jenkins/client/job/decapod/del_osd.yml b/jenkins/client/job/decapod/del_osd.yml
new file mode 100644
index 0000000..b432762
--- /dev/null
+++ b/jenkins/client/job/decapod/del_osd.yml
@@ -0,0 +1,30 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        decapod_del_osd:
+          type: workflow-scm
+          name: decapod-del_osd
+          display_name: "Decapod - del osd"
+          discard:
+            build:
+              keep_num: 20
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
+            credentials: "gerrit"
+            script: del-osd.groovy
+          param:
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              default: "salt"
+            SALT_MASTER_IP:
+              type: string
+              default: "${_param:infra_config_address}"
+            SALT_MASTER_PORT:
+              type: string
+              default: "${_param:salt_master_api_port}"
+            ASK_ON_ERROR:
+              type: boolean
+              default: 'false'
\ No newline at end of file
diff --git a/jenkins/client/job/decapod/monitoring.yml b/jenkins/client/job/decapod/monitoring.yml
new file mode 100644
index 0000000..ea6a5c2
--- /dev/null
+++ b/jenkins/client/job/decapod/monitoring.yml
@@ -0,0 +1,30 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        decapod_monitoring:
+          type: workflow-scm
+          name: decapod-monitoring
+          display_name: "Decapod - monitoring"
+          discard:
+            build:
+              keep_num: 20
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/decapod-pipelines"
+            credentials: "gerrit"
+            script: monitoring.groovy
+          param:
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              default: "salt"
+            SALT_MASTER_IP:
+              type: string
+              default: "${_param:infra_config_address}"
+            SALT_MASTER_PORT:
+              type: string
+              default: "${_param:salt_master_api_port}"
+            ASK_ON_ERROR:
+              type: boolean
+              default: 'false'
\ No newline at end of file
diff --git a/jenkins/client/job/deploy/lab/cicd.yml b/jenkins/client/job/deploy/lab/cicd.yml
index 9002c9c..260e7b1 100644
--- a/jenkins/client/job/deploy/lab/cicd.yml
+++ b/jenkins/client/job/deploy/lab/cicd.yml
@@ -63,6 +63,10 @@
               OPENSTACK_API_URL:
                 type: string
                 default: "https://cloud-cz.bud.mirantis.net:5000"
+              TARGET_OPENSTACK_IP:
+                type: string
+                default: "${_param:oss_target_openstack_ip}"
+                description: "IP address of the OpenStack deployment, managed by OSS tooling"
               OPENSTACK_API_CREDENTIALS:
                 type: string
                 default: "openstack-devcloud-credentials"
diff --git a/jenkins/client/job/deploy/lab/mk/cleanup.yml b/jenkins/client/job/deploy/lab/cleanup.yml
similarity index 100%
rename from jenkins/client/job/deploy/lab/mk/cleanup.yml
rename to jenkins/client/job/deploy/lab/cleanup.yml
diff --git a/jenkins/client/job/deploy/lab/component/aaa.yml b/jenkins/client/job/deploy/lab/component/aaa.yml
new file mode 100644
index 0000000..1c640d5
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/component/aaa.yml
@@ -0,0 +1,11 @@
+classes:
+  - system.jenkins.client.job.deploy.lab.deploy
+parameters:
+  _param:
+    jenkins_deploy_jobs:
+      - stack_name: aaa_ha_freeipa
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,aaa
+        stack_test: ""
+        job_timer: ""
diff --git a/jenkins/client/job/deploy/lab/component/ceph.yml b/jenkins/client/job/deploy/lab/component/ceph.yml
new file mode 100644
index 0000000..b0b3af1
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/component/ceph.yml
@@ -0,0 +1,11 @@
+classes:
+  - system.jenkins.client.job.deploy.lab.deploy
+parameters:
+  _param:
+    jenkins_deploy_jobs:
+      - stack_name: ceph_ha
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,ceph
+        stack_test: "ceph"
+        job_timer: ""
diff --git a/jenkins/client/job/deploy/lab/component/drivetrain.yml b/jenkins/client/job/deploy/lab/component/drivetrain.yml
new file mode 100644
index 0000000..945ac4a
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/component/drivetrain.yml
@@ -0,0 +1,17 @@
+classes:
+  - system.jenkins.client.job.deploy.lab.deploy
+parameters:
+  _param:
+    jenkins_deploy_jobs:
+      - stack_name: drivetrain_ha
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core
+        stack_test: ""
+        job_timer: ""
+      - stack_name: drivetrain_ha_clusters
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core
+        stack_test: ""
+        job_timer: ""
diff --git a/jenkins/client/job/deploy/lab/component/kubernetes.yml b/jenkins/client/job/deploy/lab/component/kubernetes.yml
new file mode 100644
index 0000000..5ef3bd9
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/component/kubernetes.yml
@@ -0,0 +1,35 @@
+classes:
+  - system.jenkins.client.job.deploy.lab.deploy
+parameters:
+  _param:
+    jenkins_deploy_jobs:
+      - stack_name: k8s_aio_calico
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,k8s,calico
+        stack_test: ""
+        job_timer: ""
+      - stack_name: k8s_aio_contrail
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,k8s,contrail
+        stack_test: ""
+        job_timer: ""
+      - stack_name: k8s_ha_calico
+        stack_env: devcloud
+        stack_type: aws
+        stack_install: core,k8s,calico
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
+      - stack_name: k8s_ha_calico
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,k8s,calico
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
+      - stack_name: k8s_ha_contrail
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,k8s,contrail
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/deploy/lab/component/openstack.yml b/jenkins/client/job/deploy/lab/component/openstack.yml
new file mode 100644
index 0000000..1e1d334
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/component/openstack.yml
@@ -0,0 +1,28 @@
+classes:
+  - system.jenkins.client.job.deploy.lab.deploy
+parameters:
+  _param:
+    jenkins_deploy_jobs:
+      - stack_name: os_aio_contrail
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,openstack,contrail
+        stack_test: ""
+        job_timer: ""
+      - stack_name: os_aio_ovs
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,openstack,ovs
+        job_timer: ""
+      - stack_name: os_ha_contrail
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,openstack,contrail
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
+      - stack_name: os_ha_ovs
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,openstack,ovs
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/deploy/lab/component/stacklight.yml b/jenkins/client/job/deploy/lab/component/stacklight.yml
new file mode 100644
index 0000000..94ccce2
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/component/stacklight.yml
@@ -0,0 +1,23 @@
+classes:
+  - system.jenkins.client.job.deploy.lab.deploy
+parameters:
+  _param:
+    jenkins_deploy_jobs:
+      - stack_name: stacklight_k8s_calico
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,k8s,calico,stacklight
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
+      - stack_name: stacklight_os_contrail
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,openstack,contrail,stacklight
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
+      - stack_name: stacklight_os_ovs
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,openstack,ovs,stacklight
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/deploy.yml
similarity index 79%
rename from jenkins/client/job/deploy/lab/mk/init.yml
rename to jenkins/client/job/deploy/lab/deploy.yml
index b25fd03..75bab43 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -1,39 +1,60 @@
 parameters:
   _param:
-    jenkins_deploy_lab_mk_jobs: []
+    jenkins_deploy_jobs: []
   jenkins:
     client:
       job_template:
-        deploy_heat_template:
-          name: deploy-{{stack_type}}-{{lab}}
-          jobs: ${_param:jenkins_deploy_lab_mk_jobs}
+        deploy_template:
+          name: deploy-{{stack_type}}-{{stack_name}}
+          jobs: ${_param:jenkins_deploy_jobs}
           template:
             type: workflow-scm
             discard:
               build:
                 keep_num: 20
             concurrent: true
-            display_name: "Deploy - {{lab}} {{stack_type}} lab"
+            display_name: "Deploy - {{stack_name}} {{stack_type}}"
             scm:
               type: git
               url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
               credentials: "gerrit"
-              script: lab-pipeline.groovy
+              script: cloud-deploy-pipeline.groovy
             trigger:
               timer:
-                spec: "{{timer}}"
+                spec: "{{job_timer}}"
             param:
-              # deployments and test settings
+              # general parameters
+              ASK_ON_ERROR:
+                type: boolean
+                default: 'false'
+
+              # deployments
+              STACK_NAME:
+                type: string
+                description: Heat stack name. Will be generated if missing.
               STACK_TYPE:
                 type: string
                 default: "{{stack_type}}"
               STACK_INSTALL:
                 type: string
-                default: "{{install}}"
+                default: "{{stack_install}}"
               STACK_TEST:
                 type: string
-                default: "{{test}}"
+                default: "{{stack_test}}"
+              STACK_REUSE:
+                type: boolean
+                default: 'false'
+              STACK_DELETE:
+                type: boolean
+                default: 'true'
+                description: "Don't enable it if you need to use the lab after"
+              STACK_COMPUTE_COUNT:
+                type: string
+                default: '2'
 
+              STACK_TEMPLATE:
+                type: string
+                default: "{{stack_name}}"
               STACK_TEMPLATE_URL:
                 type: string
                 default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
@@ -43,34 +64,11 @@
               STACK_TEMPLATE_BRANCH:
                 type: string
                 default: "master"
-              STACK_NAME:
-                type: string
-                description: Heat stack name. Will be generated if missing.
-              STACK_TEMPLATE:
-                type: string
-                default: "{{lab}}"
-              STACK_DELETE:
-                type: boolean
-                default: 'true'
-                description: "Don't enable it if you need to use the lab after"
-              STACK_REUSE:
-                type: boolean
-                default: 'false'
               STACK_CLEANUP_JOB:
                 type: string
                 default: 'deploy-stack-cleanup'
-              # heat
-              HEAT_STACK_ENVIRONMENT:
-                type: string
-                default: "devcloud"
-              HEAT_STACK_ZONE:
-                type: string
-                default: "mcp-mk"
-              HEAT_STACK_PUBLIC_NET:
-                type: string
-                default: "public"
 
-              # salt master
+              # salt
               SALT_MASTER_CREDENTIALS:
                 type: string
                 default: "salt-qa-credentials"
@@ -82,6 +80,28 @@
                 default: ""
                 description: "YAML with overrides for Salt deployment"
 
+              # aws api
+              AWS_STACK_REGION:
+                type: string
+                default: "us-west-2"
+              AWS_API_CREDENTIALS:
+                type: string
+                default: "aws-credentials"
+              AWS_SSH_KEY:
+                type: string
+                default: "jenkins-mk"
+
+              # heat
+              HEAT_STACK_ENVIRONMENT:
+                type: string
+                default: "{{stack_env}}"
+              HEAT_STACK_ZONE:
+                type: string
+                default: "mcp-mk"
+              HEAT_STACK_PUBLIC_NET:
+                type: string
+                default: "public"
+
               # openstack api
               OPENSTACK_API_URL:
                 type: string
@@ -92,26 +112,24 @@
               OPENSTACK_API_PROJECT:
                 type: string
                 default: "mcp-mk"
-              OPENSTACK_API_CLIENT:
-                type: string
-                default: ""
-              OPENSTACK_API_VERSION:
-                type: string
-                default: "3"
               OPENSTACK_API_PROJECT_DOMAIN:
                 type: string
                 default: "default"
               OPENSTACK_API_PROJECT_ID:
                 type: string
                 default: ""
-              OPENSTACK_USER_DOMAIN:
-                type: string
-                default: "default"
               OPENSTACK_API_USER_DOMAIN:
                 type: string
                 default: "default"
 
-              # k8s setttings
+              OPENSTACK_API_CLIENT:
+                type: string
+                default: ""
+              OPENSTACK_API_VERSION:
+                type: string
+                default: "3"
+
+              # test
               TEST_K8S_API_SERVER:
                 type: string
                 default: "http://127.0.0.1:8080"
@@ -119,10 +137,9 @@
                 type: string
                 default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.5.1-3_1482332392819"
 
-              # Tempest settings
               TEST_TEMPEST_IMAGE:
                 type: string
-                description: "Tempest image link"
+                description: "Tempest docker image"
                 default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
               TEST_TEMPEST_TARGET:
                 type: string
@@ -137,7 +154,3 @@
                 description: "Run tests matched to pattern only"
                 default: ""
 
-              ASK_ON_ERROR:
-                type: boolean
-                default: 'false'
-
diff --git a/jenkins/client/job/deploy/lab/init.yml b/jenkins/client/job/deploy/lab/init.yml
index 6b0d5ab..860e55f 100644
--- a/jenkins/client/job/deploy/lab/init.yml
+++ b/jenkins/client/job/deploy/lab/init.yml
@@ -1,11 +1,16 @@
 classes:
-  - system.jenkins.client.job.deploy.lab.mk.physical
-  - system.jenkins.client.job.deploy.lab.mk.virtual
-  - system.jenkins.client.job.deploy.lab.mk.cleanup
-  - system.jenkins.client.job.deploy.lab.mk.cloud
   - system.jenkins.client.job.deploy.lab.cicd
-  - system.jenkins.client.job.deploy.lab.test-cicd
+  - system.jenkins.client.job.deploy.lab.test-devops-portal-cicd
   - system.jenkins.client.job.deploy.lab.demo
+  - system.jenkins.client.job.deploy.lab.cleanup
+  - system.jenkins.client.job.deploy.lab.release.mcp05
+  - system.jenkins.client.job.deploy.lab.release.mcp10
+  - system.jenkins.client.job.deploy.lab.release.mcp11
+  - system.jenkins.client.job.deploy.lab.component.aaa
+  - system.jenkins.client.job.deploy.lab.component.ceph
+  - system.jenkins.client.job.deploy.lab.component.kubernetes
+  - system.jenkins.client.job.deploy.lab.component.openstack
+  - system.jenkins.client.job.deploy.lab.component.stacklight
 
 parameters:
   jenkins:
diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
deleted file mode 100644
index 81e2121..0000000
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ /dev/null
@@ -1,227 +0,0 @@
-parameters:
-  _param:
-    jenkins_cloud_deploy_pipelines:
-      # Identity AAA
-      - stack_name: aaa_ha_freeipa
-        stack_type: heat
-        stack_install: core,aaa
-        stack_test: ""
-        job_timer: ""
-        extra_formulas: ""
-      - stack_name: k8s_ha_calico
-        stack_type: aws
-        stack_install: core,k8s,calico
-        stack_test: ""
-        job_timer: "H H * * *"
-      - stack_name: ceph_ha
-        stack_type: heat
-        stack_install: core,ceph
-        stack_test: "ceph"
-        job_timer: ""
-#      - stack_name: drivetrain_ha
-#        stack_type: heat
-#        stack_install: core
-#        stack_test: ""
-#        job_timer: ""
-#      - stack_name: drivetrain_ha_clusters
-#        stack_type: heat
-#        stack_install: core
-#        stack_test: ""
-#        job_timer: ""
-      - stack_name: k8s_aio_calico
-        stack_type: heat
-        stack_install: core,k8s,calico
-        stack_test: ""
-        job_timer: ""
-      - stack_name: k8s_aio_contrail
-        stack_type: heat
-        stack_install: core,k8s,contrail
-        stack_test: ""
-        job_timer: ""
-      - stack_name: k8s_ha_calico
-        stack_type: heat
-        stack_install: core,k8s,calico
-        stack_test: ""
-        job_timer: "H H(0-6) * * *"
-      - stack_name: k8s_ha_contrail
-        stack_type: heat
-        stack_install: core,k8s,contrail
-        stack_test: ""
-        job_timer: "H H(0-6) * * *"
-      - stack_name: os_aio_contrail
-        stack_type: heat
-        stack_install: core,openstack,contrail
-        stack_test: ""
-        job_timer: ""
-      - stack_name: os_aio_ovs
-        stack_type: heat
-        stack_install: core,openstack,ovs
-        job_timer: ""
-      - stack_name: os_ha_contrail
-        stack_type: heat
-        stack_install: core,openstack,contrail
-        stack_test: ""
-        job_timer: "H H(0-6) * * *"
-      - stack_name: os_ha_ovs
-        stack_type: heat
-        stack_install: core,openstack,ovs
-        stack_test: ""
-        job_timer: "H H(0-6) * * *"
-      - stack_name: stacklight_k8s_calico
-        stack_type: heat
-        stack_install: core,k8s,calico,stacklight
-        stack_test: ""
-        job_timer: "H H(0-6) * * *"
-      - stack_name: stacklight_os_contrail
-        stack_type: heat
-        stack_install: core,openstack,contrail,stacklight
-        stack_test: ""
-        job_timer: "H H(0-6) * * *"
-      - stack_name: stacklight_os_ovs
-        stack_type: heat
-        stack_install: core,openstack,ovs,stacklight
-        stack_test: ""
-        job_timer: "H H(0-6) * * *"
-  jenkins:
-    client:
-      job_template:
-        cloud_deploy_heat_template:
-          name: deploy-{{stack_type}}-{{stack_name}}
-          jobs: ${_param:jenkins_cloud_deploy_pipelines}
-          template:
-            type: workflow-scm
-            discard:
-              build:
-                keep_num: 20
-            concurrent: true
-            display_name: "Deploy - {{stack_name}} {{stack_type}}"
-            scm:
-              type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-              credentials: "gerrit"
-              script: cloud-deploy-pipeline.groovy
-            trigger:
-              timer:
-                spec: "{{job_timer}}"
-            param:
-              # general parameters
-              ASK_ON_ERROR:
-                type: boolean
-                default: 'false'
-
-              # deployments
-              STACK_NAME:
-                type: string
-                description: Heat stack name. Will be generated if missing.
-              STACK_TEMPLATE:
-                type: string
-                default: "{{stack_name}}"
-              STACK_TYPE:
-                type: string
-                default: "{{stack_type}}"
-              STACK_INSTALL:
-                type: string
-                default: "{{stack_install}}"
-              STACK_TEST:
-                type: string
-                default: "{{stack_test}}"
-              STACK_DELETE:
-                type: boolean
-                default: 'true'
-                description: "Don't enable it if you need to use the lab after"
-              STACK_REUSE:
-                type: boolean
-                default: 'false'
-              STACK_COMPUTE_COUNT:
-                type: string
-                default: '2'
-
-              STACK_TEMPLATE_URL:
-                type: string
-                default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
-              STACK_TEMPLATE_CREDENTIALS:
-                type: string
-                default: "gerrit"
-              STACK_TEMPLATE_BRANCH:
-                type: string
-                default: "master"
-              STACK_CLEANUP_JOB:
-                type: string
-                default: 'deploy-stack-cleanup'
-
-              # salt master
-              SALT_MASTER_CREDENTIALS:
-                type: string
-                default: "salt-qa-credentials"
-              SALT_MASTER_URL:
-                type: string
-                default: ""
-              SALT_OVERRIDES:
-                type: text
-                default: ""
-
-              # aws api
-              AWS_STACK_REGION:
-                type: string
-                default: "us-west-2"
-              AWS_API_CREDENTIALS:
-                type: string
-                default: "aws-credentials"
-              AWS_SSH_KEY:
-                type: string
-                default: "jenkins-mk"
-
-
-              # openstack api
-              OPENSTACK_API_URL:
-                type: string
-                default: "https://cloud-cz.bud.mirantis.net:5000"
-              OPENSTACK_API_CREDENTIALS:
-                type: string
-                default: "openstack-devcloud-credentials"
-              OPENSTACK_API_PROJECT:
-                type: string
-                default: "mcp-mk"
-              OPENSTACK_API_CLIENT:
-                type: string
-                default: ""
-              OPENSTACK_API_VERSION:
-                type: string
-                default: "3"
-              OPENSTACK_API_PROJECT_DOMAIN:
-                type: string
-                default: "default"
-              OPENSTACK_API_USER_DOMAIN_ID:
-                type: string
-                default: "default"
-              OPENSTACK_API_PROJECT_ID:
-                type: string
-                default: ""
-              OPENSTACK_API_USER_DOMAIN:
-                type: string
-                default: "default"
-
-              # heat
-              HEAT_STACK_ENVIRONMENT:
-                type: string
-                default: "devcloud"
-              HEAT_STACK_ZONE:
-                type: string
-                default: "mcp-mk"
-              HEAT_STACK_PUBLIC_NET:
-                type: string
-                default: "public"
-
-              # k8s setttings
-              TEST_K8S_API_SERVER:
-                type: string
-                default: "http://127.0.0.1:8080"
-              TEST_K8S_CONFORMANCE_IMAGE:
-                type: string
-                default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.5.1-3_1482332392819"
-
-              # openstack settings
-              TEST_TEMPEST_IMAGE:
-                type: string
-                default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
-
diff --git a/jenkins/client/job/deploy/lab/mk/physical.yml b/jenkins/client/job/deploy/lab/mk/physical.yml
deleted file mode 100644
index 8e6d498..0000000
--- a/jenkins/client/job/deploy/lab/mk/physical.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-classes:
-  - system.jenkins.client.job.deploy.lab.mk
-parameters:
-  _param:
-    jenkins_deploy_lab_mk_jobs:
-      - lab: mcp10_contrail
-        install: core,kvm,openstack,contrail
-        stack_type: physical
-        test: openstack
-        timer: ""
-      - lab: mcp10_opencontrail_nfv
-        install: core,kvm,openstack,nfv
-        stack_type: physical
-        test: openstack
-        timer: ""
-      - lab: mcp10_dvr
-        install: core,kvm,openstack,dvr
-        stack_type: physical
-        test: openstack
-        timer: ""
-      - lab: mcp10_non_dvr
-        install: core,kvm,openstack
-        stack_type: physical
-        test: openstack
-        timer: ""
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
deleted file mode 100644
index 31b035f..0000000
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-classes:
-  - system.jenkins.client.job.deploy.lab.mk
-parameters:
-  _param:
-    jenkins_deploy_lab_mk_jobs:
-      # mk20
-      - lab: virtual_mk20_advanced
-        install: core,openstack
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
-      - lab: virtual_mk20_basic
-        install: core,openstack
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
-      # mk22
-      - lab: virtual_mk22_advanced
-        install: core,openstack
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
-      - lab: virtual_mk22_basic
-        install: core,openstack
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
-      # mcp05
-      - lab: virtual_mcp05_dvr
-        install: core,openstack,dvr
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
-      - lab: virtual_mcp05_ovs
-        install: core,openstack,ovs
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
-      # mcp10
-      - lab: virtual_mcp10_contrail
-        install: core,openstack,contrail
-        stack_type: heat
-        test: ""
-        timer: "H H(0-6) * * *"
-        extra_formulas: ""
-      - lab: virtual_mcp10_dvr
-        install: core,openstack,dvr
-        stack_type: heat
-        test: ""
-        timer: "H H(0-6) * * *"
-        extra_formulas: ""
-      - lab: virtual_mcp10_ovs
-        install: core,openstack,ovs
-        stack_type: heat
-        test: ""
-        timer: "H H(0-6) * * *"
-        extra_formulas: ""
-      # mcp11
-      - lab: virtual_mcp11_contrail
-        install: core,openstack,contrail
-        stack_type: heat
-        test: ""
-        extra_formulas: ""
-        timer: ""
-      - lab: virtual_mcp11_dvr
-        install: core,openstack,dvr
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
-      - lab: virtual_mcp11_ovs
-        install: core,openstack,ovs
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
-      - lab: virtual_mcp11_ironic_small
-        install: core,openstack
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
-      - lab: virtual_mcp11_aio
-        install: core,openstack
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
-      - lab: virtual_mcp11_k8s_calico
-        install: core,k8s,calico
-        stack_type: heat
-        test: k8s
-        timer: "H H(0-6) * * *"
-        extra_formulas: ""
-      - lab: virtual_mcp11_k8s_contrail
-        install: core,k8s,contrail
-        stack_type: heat
-        test: k8s
-        timer: "H H(0-6) * * *"
-        extra_formulas: ""
-      - lab: virtual_mcp11_contrail_nfv
-        install: core,openstack,contrail
-        stack_type: heat
-        test: ""
-        timer: "H H(0-6) * * *"
-        extra_formulas: ""
-      - lab: virtual_mcp11_ovs_dpdk
-        install: core,openstack,ovs
-        stack_type: heat
-        test: ""
-        timer: "H H(0-6) * * *"
-        extra_formulas: ""
-      # Identity AAA
-      - lab: virtual_aaa_freeipa
-        install: core,aaa
-        stack_type: heat
-        test: ""
-        timer: ""
-        extra_formulas: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp05.yml b/jenkins/client/job/deploy/lab/release/mcp05.yml
new file mode 100644
index 0000000..5ec2787
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/release/mcp05.yml
@@ -0,0 +1,17 @@
+classes:
+  - system.jenkins.client.job.deploy.lab.deploy
+parameters:
+  _param:
+    jenkins_deploy_jobs:
+      - stack_name: virtual_mcp05_dvr
+        stack_env: virtual_mcp05_dvr/devcloud
+        stack_install: core,openstack,dvr
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
+      - stack_name: virtual_mcp05_ovs
+        stack_env: virtual_mcp05_ovs/devcloud
+        stack_install: core,openstack,ovs
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp10.yml b/jenkins/client/job/deploy/lab/release/mcp10.yml
new file mode 100644
index 0000000..516d533
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/release/mcp10.yml
@@ -0,0 +1,50 @@
+classes:
+  - system.jenkins.client.job.deploy.lab.deploy
+parameters:
+  _param:
+    jenkins_deploy_jobs:
+      # physical
+      - stack_name: mcp10_contrail
+        stack_env: mcp10_contrail/devcloud
+        stack_install: core,kvm,openstack,contrail
+        stack_type: physical
+        stack_test: openstack
+        job_timer: ""
+      - stack_name: mcp10_opencontrail_nfv
+        stack_env: mcp10_opencontrail_nfv/devcloud
+        stack_install: core,kvm,openstack,nfv
+        stack_type: physical
+        stack_test: openstack
+        job_timer: ""
+      - stack_name: mcp10_dvr
+        stack_env: mcp10_dvr/devcloud
+        stack_install: core,kvm,openstack,dvr
+        stack_type: physical
+        stack_test: openstack
+        job_timer: ""
+      - stack_name: mcp10_non_dvr
+        stack_env: mcp10_non_dvr/devcloud
+        stack_install: core,kvm,openstack
+        stack_type: physical
+        stack_test: openstack
+        job_timer: ""
+
+      # virtual
+      - stack_name: virtual_mcp10_contrail
+        stack_env: virtual_mcp10_contrail/devcloud
+        stack_install: core,openstack,contrail
+        stack_type: heat
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
+      - stack_name: virtual_mcp10_dvr
+        stack_env: virtual_mcp10_dvr/devcloud
+        stack_install: core,openstack,dvr
+        stack_type: heat
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
+      - stack_name: virtual_mcp10_ovs
+        stack_env: virtual_mcp10_ovs/devcloud
+        stack_install: core,openstack,ovs
+        stack_type: heat
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
new file mode 100644
index 0000000..27f2184
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -0,0 +1,59 @@
+classes:
+  - system.jenkins.client.job.deploy.lab.deploy
+parameters:
+  _param:
+    jenkins_deploy_jobs:
+      - stack_name: virtual_mcp11_contrail
+        stack_env: virtual_mcp11_contrail/devcloud
+        stack_install: core,openstack,contrail
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
+      - stack_name: virtual_mcp11_dvr
+        stack_env: virtual_mcp11_dvr/devcloud
+        stack_install: core,openstack,dvr
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
+      - stack_name: virtual_mcp11_ovs
+        stack_env: virtual_mcp11_ovs/devcloud
+        stack_install: core,openstack,ovs
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
+      - stack_name: virtual_mcp11_ironic_small
+        stack_env: virtual_mcp11_ironic_small/devcloud
+        stack_install: core,openstack
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
+      - stack_name: virtual_mcp11_aio
+        stack_env: virtual_mcp11_aio/devcloud
+        stack_install: core,openstack
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
+      - stack_name: virtual_mcp11_k8s_calico
+        stack_env: virtual_mcp11_k8s_calico/devcloud
+        stack_install: core,k8s,calico
+        stack_type: heat
+        stack_test: k8s
+        job_timer: "H H(0-6) * * *"
+      - stack_name: virtual_mcp11_k8s_contrail
+        stack_env: virtual_mcp11_k8s_contrail/devcloud
+        stack_install: core,k8s,contrail
+        stack_type: heat
+        stack_test: k8s
+        job_timer: "H H(0-6) * * *"
+      - stack_name: virtual_mcp11_contrail_nfv
+        stack_env: virtual_mcp11_contrail_nfv/devcloud
+        stack_install: core,openstack,contrail
+        stack_type: heat
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
+      - stack_name: virtual_mcp11_ovs_dpdk
+        stack_env: virtual_mcp11_ovs_dpdk/devcloud
+        stack_install: core,openstack,ovs
+        stack_type: heat
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/deploy/lab/release/mk.yml b/jenkins/client/job/deploy/lab/release/mk.yml
new file mode 100644
index 0000000..1be1057
--- /dev/null
+++ b/jenkins/client/job/deploy/lab/release/mk.yml
@@ -0,0 +1,31 @@
+classes:
+  - system.jenkins.client.job.deploy.lab.deploy
+parameters:
+  _param:
+    jenkins_deploy_jobs:
+      # mk20
+      - stack_name: virtual_mk20_advanced
+        stack_env: virtual_mk20_advanced/devcloud
+        stack_install: core,openstack
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
+      - stack_name: virtual_mk20_basic
+        stack_env: virtual_mk20_basic/devcloud
+        stack_install: core,openstack
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
+      # mk22
+      - stack_name: virtual_mk22_advanced
+        stack_env: virtual_mk22_advanced/devcloud
+        stack_install: core,openstack
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
+      - stack_name: virtual_mk22_basic
+        stack_env: virtual_mk22_basic/devcloud
+        stack_install: core,openstack
+        stack_type: heat
+        stack_test: ""
+        job_timer: ""
diff --git a/jenkins/client/job/deploy/lab/test-cicd.yml b/jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
similarity index 96%
rename from jenkins/client/job/deploy/lab/test-cicd.yml
rename to jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
index 0205223..ab84659 100644
--- a/jenkins/client/job/deploy/lab/test-cicd.yml
+++ b/jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
@@ -13,9 +13,9 @@
             display_name: "Deploy {{name}} heat stack"
             scm:
               type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+              url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
               credentials: "gerrit"
-              script: cicd-lab-pipeline.groovy
+              script: test-func-devops-portal-pipeline.groovy
             param:
               # heat
               HEAT_TEMPLATE_URL:
diff --git a/jenkins/client/job/deploy/openstack.yml b/jenkins/client/job/deploy/openstack.yml
index c2eb71b..f316ab4 100644
--- a/jenkins/client/job/deploy/openstack.yml
+++ b/jenkins/client/job/deploy/openstack.yml
@@ -14,7 +14,7 @@
             type: git
             url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
             credentials: "gerrit"
-            script: lab-pipeline.groovy
+            script: cloud-deploy-pipeline.groovy
           param:
             # deployments and test settings
             STACK_TYPE:
@@ -53,4 +53,4 @@
             TARGET_SERVERS:
               type: string
               default: ""
-              description: "Salt compound target to match nodes to be updated [*, G@osfamily:debian]."
\ No newline at end of file
+              description: "Salt compound target to match nodes to be updated [*, G@osfamily:debian]."
diff --git a/jenkins/client/job/deploy/update/package.yml b/jenkins/client/job/deploy/update/package.yml
index a4e7fc0..55a9ef0 100644
--- a/jenkins/client/job/deploy/update/package.yml
+++ b/jenkins/client/job/deploy/update/package.yml
@@ -29,7 +29,7 @@
               description: Salt compound target to match nodes to be updated [*, G@osfamily:debian].
             TARGET_PACKAGES:
               type: string
-              description: Space delimited list of packages to be updates [package1=version package2=version], empty string means all updating all packages to the latest version.
+              description: Space delimited list of packages to be updated, empty string means updating all packages to the latest version e.g. [package1=version package2=version] or [package1 package2].
             TARGET_SUBSET_TEST:
               type: string
               description: Number of nodes to list package updates, empty string means all targetted nodes.
diff --git a/jenkins/client/job/docker/oss/init.yml b/jenkins/client/job/docker/oss/init.yml
index 1157bd3..386ea75 100644
--- a/jenkins/client/job/docker/oss/init.yml
+++ b/jenkins/client/job/docker/oss/init.yml
@@ -3,4 +3,9 @@
   - system.jenkins.client.job.docker.oss.devops-portal
   - system.jenkins.client.job.docker.oss.janitor-monkey-codebase
   - system.jenkins.client.job.docker.oss.janitor-monkey-docker
+  - system.jenkins.client.job.docker.oss.pushkin-docker
+  - system.jenkins.client.job.docker.oss.pushkin-codebase
+  - system.jenkins.client.job.docker.oss.pushkin-codebase-ext
   - system.jenkins.client.job.docker.oss.rundeck
+  - system.jenkins.client.job.docker.oss.security-monkey-docker
+  - system.jenkins.client.job.docker.oss.security-monkey-codebase-openstack
diff --git a/jenkins/client/job/docker/oss/janitor-monkey-docker.yml b/jenkins/client/job/docker/oss/janitor-monkey-docker.yml
index 083d086..78167bd 100644
--- a/jenkins/client/job/docker/oss/janitor-monkey-docker.yml
+++ b/jenkins/client/job/docker/oss/janitor-monkey-docker.yml
@@ -58,10 +58,4 @@
               default: "Dockerfile"
             CONTEXT_PATH:
               type: string
-              default: "."
-            CI_BUILD_ARG_JANITOR_MONKEY_REPO:
-              type: string
-              default: ""
-            CI_BUILD_ARG_JANITOR_MONKEY_REF:
-              type: string
-              default: ""
\ No newline at end of file
+              default: "."
\ No newline at end of file
diff --git a/jenkins/client/job/docker/oss/pushkin-codebase-ext.yml b/jenkins/client/job/docker/oss/pushkin-codebase-ext.yml
new file mode 100644
index 0000000..1a5b5b6
--- /dev/null
+++ b/jenkins/client/job/docker/oss/pushkin-codebase-ext.yml
@@ -0,0 +1,73 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        docker-build-images-pushkin-codebase-ext:
+          name: docker-build-images-pushkin-codebase-ext
+          discard:
+            build:
+              keep_num: 25
+            artifact:
+              keep_num: 25
+          type: workflow-scm
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+            credentials: "gerrit"
+            script: docker-build-image-pipeline.groovy
+          trigger:
+            gerrit:
+              project:
+                "oss/pushkin-extensions":
+                  branches:
+                    - master
+              skip_vote:
+                - successful
+                - failed
+                - unstable
+                - not_built
+              event:
+                patchset:
+                  - created:
+                      excludeDrafts: false
+                      excludeNoCodeChange: false
+                change:
+                  - merged
+                comment:
+                  - addedContains:
+                      commentAddedCommentContains: 'rebuild'
+          param:
+            IMAGE_NAME:
+              type: string
+              default: "pushkin"
+            IMAGE_TAGS:
+              type: string
+              default: ""
+            CREDENTIALS_ID:
+              type: string
+              default: "gerrit"
+            DOCKER_REGISTRY:
+              type: string
+              default: "docker-dev-virtual.docker.mirantis.net"
+            PROJECT_NAMESPACE:
+              type: string
+              default: "oss"
+            DOCKERFILE_PATH:
+              type: string
+              default: "Dockerfile"
+            CONTEXT_PATH:
+              type: string
+              default: "."
+            CUSTOM_GERRIT_PROJECT:
+              type: string
+              default: oss/docker-pushkin
+            CUSTOM_GERRIT_BRANCH:
+              type: string
+              default: master
+            CI_BUILD_ARG_PUSHKIN_EXT_REPO:
+              type: string
+              default: ""
+            CI_BUILD_ARG_PUSHKIN_EXT_REF:
+              type: string
+              default: ""
diff --git a/jenkins/client/job/docker/oss/pushkin-codebase.yml b/jenkins/client/job/docker/oss/pushkin-codebase.yml
new file mode 100644
index 0000000..f40bde3
--- /dev/null
+++ b/jenkins/client/job/docker/oss/pushkin-codebase.yml
@@ -0,0 +1,73 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        docker-build-images-pushkin-codebase:
+          name: docker-build-images-pushkin-codebase
+          discard:
+            build:
+              keep_num: 25
+            artifact:
+              keep_num: 25
+          type: workflow-scm
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+            credentials: "gerrit"
+            script: docker-build-image-pipeline.groovy
+          trigger:
+            gerrit:
+              project:
+                "oss/pushkin":
+                  branches:
+                    - devel
+              skip_vote:
+                - successful
+                - failed
+                - unstable
+                - not_built
+              event:
+                patchset:
+                  - created:
+                      excludeDrafts: false
+                      excludeNoCodeChange: false
+                change:
+                  - merged
+                comment:
+                  - addedContains:
+                      commentAddedCommentContains: 'rebuild'
+          param:
+            IMAGE_NAME:
+              type: string
+              default: "pushkin"
+            IMAGE_TAGS:
+              type: string
+              default: ""
+            CREDENTIALS_ID:
+              type: string
+              default: "gerrit"
+            DOCKER_REGISTRY:
+              type: string
+              default: "docker-dev-virtual.docker.mirantis.net"
+            PROJECT_NAMESPACE:
+              type: string
+              default: "oss"
+            DOCKERFILE_PATH:
+              type: string
+              default: "Dockerfile"
+            CONTEXT_PATH:
+              type: string
+              default: "."
+            CUSTOM_GERRIT_PROJECT:
+              type: string
+              default: oss/docker-pushkin
+            CUSTOM_GERRIT_BRANCH:
+              type: string
+              default: master
+            CI_BUILD_ARG_PUSHKIN_REPO:
+              type: string
+              default: ""
+            CI_BUILD_ARG_PUSHKIN_REF:
+              type: string
+              default: ""
diff --git a/jenkins/client/job/docker/oss/pushkin-docker.yml b/jenkins/client/job/docker/oss/pushkin-docker.yml
new file mode 100644
index 0000000..e77e99b
--- /dev/null
+++ b/jenkins/client/job/docker/oss/pushkin-docker.yml
@@ -0,0 +1,61 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        docker-build-images-pushkin-docker:
+          name: docker-build-images-pushkin-docker
+          discard:
+            build:
+              keep_num: 25
+            artifact:
+              keep_num: 25
+          type: workflow-scm
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+            credentials: "gerrit"
+            script: docker-build-image-pipeline.groovy
+          trigger:
+            gerrit:
+              project:
+                "oss/docker-pushkin":
+                  branches:
+                    - master
+              skip_vote:
+                - successful
+                - failed
+                - unstable
+                - not_built
+              event:
+                patchset:
+                  - created:
+                      excludeDrafts: false
+                      excludeNoCodeChange: false
+                change:
+                  - merged
+                comment:
+                  - addedContains:
+                      commentAddedCommentContains: 'rebuild'
+          param:
+            IMAGE_NAME:
+              type: string
+              default: "pushkin"
+            IMAGE_TAGS:
+              type: string
+              default: ""
+            CREDENTIALS_ID:
+              type: string
+              default: "gerrit"
+            DOCKER_REGISTRY:
+              type: string
+              default: "docker-dev-virtual.docker.mirantis.net"
+            PROJECT_NAMESPACE:
+              type: string
+              default: "oss"
+            DOCKERFILE_PATH:
+              type: string
+              default: "Dockerfile"
+            CONTEXT_PATH:
+              type: string
+              default: "."
\ No newline at end of file
diff --git a/jenkins/client/job/docker/oss/security-monkey-codebase-openstack.yml b/jenkins/client/job/docker/oss/security-monkey-codebase-openstack.yml
new file mode 100644
index 0000000..a135df8
--- /dev/null
+++ b/jenkins/client/job/docker/oss/security-monkey-codebase-openstack.yml
@@ -0,0 +1,73 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        docker-build-images-security-monkey-codebase-openstack:
+          name: docker-build-images-security-monkey-codebase-openstack 
+          discard:
+            build:
+              keep_num: 25
+            artifact:
+              keep_num: 25
+          type: workflow-scm
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+            credentials: "gerrit"
+            script: docker-build-image-security-monkey-pipeline.groovy
+          trigger:
+            gerrit:
+              project:
+                "oss/security-monkey-openstack":
+                  branches:
+                    - master
+              skip_vote:
+                - successful
+                - failed
+                - unstable
+                - not_built
+              event:
+                patchset:
+                  - created:
+                      excludeDrafts: false
+                      excludeNoCodeChange: false
+                change:
+                  - merged
+                comment:
+                  - addedContains:
+                      commentAddedCommentContains: 'rebuild'
+          param:
+            IMAGE_NAME:
+              type: string
+              default: "security-monkey"
+            IMAGE_TAGS:
+              type: string
+              default: ""
+            CREDENTIALS_ID:
+              type: string
+              default: "gerrit"
+            DOCKER_REGISTRY:
+              type: string
+              default: "docker-dev-virtual.docker.mirantis.net"
+            PROJECT_NAMESPACE:
+              type: string
+              default: "oss"
+            DOCKERFILE_PATH:
+              type: string
+              default: "security-monkey/Dockerfile"
+            CONTEXT_PATH:
+              type: string
+              default: "."
+            CUSTOM_GERRIT_PROJECT:
+              type: string
+              default: oss/docker-security-monkey
+            CUSTOM_GERRIT_BRANCH:
+              type: string
+              default: master
+            CI_BUILD_ARG_SECURITY_MONKEY_OPENSTACK_REPO:
+              type: string
+              default: ""
+            CI_BUILD_ARG_SECURITY_MONKEY_OPENSTACK_REF:
+              type: string
+              default: ""
diff --git a/jenkins/client/job/docker/oss/security-monkey-docker.yml b/jenkins/client/job/docker/oss/security-monkey-docker.yml
new file mode 100644
index 0000000..b9d4512
--- /dev/null
+++ b/jenkins/client/job/docker/oss/security-monkey-docker.yml
@@ -0,0 +1,61 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        docker-build-images-security-monkey-docker:
+          name: docker-build-images-security-monkey-docker
+          discard:
+            build:
+              keep_num: 25
+            artifact:
+              keep_num: 25
+          type: workflow-scm
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+            credentials: "gerrit"
+            script: docker-build-image-security-monkey-pipeline.groovy
+          trigger:
+            gerrit:
+              project:
+                "oss/docker-security-monkey":
+                  branches:
+                    - master
+              skip_vote:
+                - successful
+                - failed
+                - unstable
+                - not_built
+              event:
+                patchset:
+                  - created:
+                      excludeDrafts: false
+                      excludeNoCodeChange: false
+                change:
+                  - merged
+                comment:
+                  - addedContains:
+                      commentAddedCommentContains: 'rebuild'
+          param:
+            IMAGE_NAME:
+              type: string
+              default: "security-monkey"
+            IMAGE_TAGS:
+              type: string
+              default: ""
+            CREDENTIALS_ID:
+              type: string
+              default: "gerrit"
+            DOCKER_REGISTRY:
+              type: string
+              default: "docker-dev-virtual.docker.mirantis.net"
+            PROJECT_NAMESPACE:
+              type: string
+              default: "oss"
+            DOCKERFILE_PATH:
+              type: string
+              default: "security-monkey/Dockerfile"
+            CONTEXT_PATH:
+              type: string
+              default: "."
\ No newline at end of file
diff --git a/jenkins/client/job/fake_test.yml b/jenkins/client/job/fake_test.yml
new file mode 100644
index 0000000..079651c
--- /dev/null
+++ b/jenkins/client/job/fake_test.yml
@@ -0,0 +1,37 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        gerrit-fake-test:
+          name: gerrit-fake-test
+          discard:
+            build:
+              keep_num: 25
+            artifact:
+              keep_num: 25
+          type: workflow-scm
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            credentials: "gerrit"
+            script: fake-test-pipeline.groovy
+          trigger:
+            gerrit:
+              project:
+                "salt-formulas/salt-formulas":
+                  branches:
+                    - master
+              event:
+                patchset:
+                  - created:
+                      excludeDrafts: false
+                      excludeTrivialRebase: false
+                      excludeNoCodeChange: false
+                comment:
+                  - addedContains:
+                      commentAddedCommentContains: '(recheck|reverify)'
+          param:
+            CREDENTIALS_ID:
+              type: string
+              default: "gerrit"
diff --git a/jenkins/client/job/gating.yml b/jenkins/client/job/gating.yml
index d0f2149..6886b06 100644
--- a/jenkins/client/job/gating.yml
+++ b/jenkins/client/job/gating.yml
@@ -38,6 +38,7 @@
             quiet_period: 60
             trigger:
               gerrit:
+                silent_start_mode: true
                 project:
                   '{{regex}}':
                     compare_type: REG_EXP
diff --git a/jenkins/client/job/image/ubuntu.yml b/jenkins/client/job/image/ubuntu.yml
index 350d2d7..c5b43d6 100644
--- a/jenkins/client/job/image/ubuntu.yml
+++ b/jenkins/client/job/image/ubuntu.yml
@@ -45,7 +45,7 @@
               default: ""
             UPLOAD_URL:
               type: string
-              default: "http://jenkins:eyoocaiG3ADireK3Eef8gae1roh5oox0@10.10.100.85:8088/"
+              default: "${_param:jenkins_packer_upload_url}"
             SKIP_UPLOAD:
               type: boolean
               default: "false"
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 01c3baf..331eb59 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -17,9 +17,11 @@
               branches: ${_param:salt_formulas_branches}
             - name: artifactory
               branches: ${_param:salt_formulas_branches}
+            - name: avinetworks
+              branches: ${_param:salt_formulas_branches}
             - name: backupninja
               branches: ${_param:salt_formulas_branches}
-            - name: avinetworks
+            - name: barbican
               branches: ${_param:salt_formulas_branches}
             - name: billometer
               branches: ${_param:salt_formulas_branches}
@@ -85,6 +87,8 @@
               branches: ${_param:salt_formulas_extra_branches}
             - name: heka
               branches: ${_param:salt_formulas_branches}
+            - name: helm
+              branches: ${_param:salt_formulas_branches}
             - name: horizon
               branches: ${_param:salt_formulas_extra_branches}
             - name: influxdb
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 8c04aba..4b6c006 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -41,7 +41,7 @@
                 default: "gerrit"
               PARALLEL_NODE_GROUP_SIZE:
                 type: string
-                default: "5"
+                default: "2"
               # Salt master setup extra formulas
               EXTRA_FORMULAS:
                 type: string
@@ -61,6 +61,9 @@
               CONFIG_NODE_NAME_PATTERN:
                 type: string
                 default: "{{config_node_name}}"
+              MAX_CPU_PER_JOB:
+                type: string
+                default: "2"
         test_system_reclass:
           name: test-salt-model-{{name}}
           template:
@@ -168,4 +171,7 @@
               default: ""
             SYSTEM_GIT_REF:
               type: string
-              default: ""
\ No newline at end of file
+              default: ""
+            MAX_CPU_PER_JOB:
+              type: string
+              default: "2"
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index 5d58f20..d0f0a6e 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -1,50 +1,56 @@
 parameters:
   jenkins:
     client:
-      job:
-        test-mk-mk-pipelines:
-          name: test-mk-mk-pipelines
-          discard:
-            build:
-              keep_num: 25
-            artifact:
-              keep_num: 25
-          type: workflow-scm
-          concurrent: true
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            credentials: "gerrit"
-            script: test-groovy-pipeline.groovy
-          trigger:
-            gerrit:
-              project:
-                "mk/mk-pipelines":
-                  branches:
-                    - master
-              event:
-                patchset:
-                  - created:
-                      excludeDrafts: false
-                      excludeTrivialRebase: false
-                      excludeNoCodeChange: false
-                comment:
-                  - addedContains:
-                      commentAddedCommentContains: '(recheck|reverify)'
-          param:
-            CREDENTIALS_ID:
-              type: string
-              default: "gerrit"
-            GRADLE_IMAGE:
-              type: string
-              default: "niaquinto/gradle"
-            GRADLE_CMD:
-              type: string
-              default: "check"
-            DEFAULT_GIT_URL:
+      job_template:
+        test-pipelines:
+          name: test-{{name}}
+          jobs:
+            - name: mk-mk-pipelines
+              repo: mk/mk-pipelines
+            - name: oss-jenkins-pipelines
+              repo: oss/jenkins/pipelines
+          template:
+            discard:
+              build:
+                keep_num: 25
+              artifact:
+                keep_num: 25
+            type: workflow-scm
+            concurrent: true
+            scm:
+              type: git
+              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+              credentials: "gerrit"
+              script: test-groovy-pipeline.groovy
+            trigger:
+              gerrit:
+                project:
+                  "{{repo}}":
+                    branches:
+                      - master
+                event:
+                  patchset:
+                    - created:
+                        excludeDrafts: false
+                        excludeTrivialRebase: false
+                        excludeNoCodeChange: false
+                  comment:
+                    - addedContains:
+                        commentAddedCommentContains: '(recheck|reverify)'
+            param:
+              CREDENTIALS_ID:
                 type: string
-                description: "Run against alternate system reclass"
-                default: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-            DEFAULT_GIT_REF:
+                default: "gerrit"
+              GRADLE_IMAGE:
                 type: string
-                default: master
+                default: "niaquinto/gradle"
+              GRADLE_CMD:
+                type: string
+                default: "check"
+              DEFAULT_GIT_URL:
+                  type: string
+                  description: "Run against alternate system reclass"
+                  default: "${_param:jenkins_gerrit_url}/{{repo}}"
+              DEFAULT_GIT_REF:
+                  type: string
+                  default: master
diff --git a/keystone/client/service/octavia.yml b/keystone/client/service/octavia.yml
index 4e14217..0382345 100644
--- a/keystone/client/service/octavia.yml
+++ b/keystone/client/service/octavia.yml
@@ -36,3 +36,4 @@
             host: ${_param:keystone_service_host}
             port: 5000
             region_name: ${_param:openstack_region}
+            use_keystoneauth: true
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index a8f7069..9b13788 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -2,6 +2,7 @@
 - service.keystone.server.cluster
 - service.keepalived.cluster.single
 - system.haproxy.proxy.listen.openstack.keystone
+- system.haproxy.proxy.listen.openstack.keystone.standalone
 parameters:
   keystone:
     server:
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 05aa1bc..0f961a3 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -18,3 +18,7 @@
         engine: calico
         prometheus:
           enabled: true
+  docker:
+    host:
+      options:
+        iptables: false
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 9be2164..00f22b8 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -16,3 +16,7 @@
       container: false
       network:
         engine: calico
+  docker:
+    host:
+      options:
+        iptables: false
diff --git a/linux/system/repo/ceph.yml b/linux/system/repo/ceph.yml
new file mode 100644
index 0000000..ccf63d7
--- /dev/null
+++ b/linux/system/repo/ceph.yml
@@ -0,0 +1,11 @@
+parameters:
+  _param:
+    linux_repo_ceph_component: jewel
+    linux_repo_ceph_mirror: download
+  linux:
+    system:
+      repo:
+        ceph:
+          source: "deb [arch=amd64] https://${_param:linux_repo_ceph_mirror}.ceph.com/debian-${_param:linux_repo_ceph_component} ${_param:linux_system_codename} main"
+          architectures: amd64
+          key_url: "https://${_param:linux_repo_ceph_mirror}.ceph.com/keys/release.asc"
diff --git a/linux/system/repo/mcp/contrail.yml b/linux/system/repo/mcp/contrail.yml
index 0d9d68e..8dad590 100644
--- a/linux/system/repo/mcp/contrail.yml
+++ b/linux/system/repo/mcp/contrail.yml
@@ -7,7 +7,7 @@
     system:
       repo:
         mcp_opencontrail:
-          source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_contrail_version} ${_param:openstack_version} ${_param:linux_repo_contrail_component} extra"
+          source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_contrail_version} ${_param:linux_repo_contrail_component} extra"
           architectures: amd64
           key_url: "http://apt-mk.mirantis.com/public.gpg"
           pin:
diff --git a/linux/system/sudo.yml b/linux/system/sudo.yml
index 8f03f7d..ba499d1 100644
--- a/linux/system/sudo.yml
+++ b/linux/system/sudo.yml
@@ -21,6 +21,7 @@
     - /bin/su -
     - /bin/su
     - /usr/sbin/visudo
+    - /usr/bin/sudo
     sudo_coreutils_safe:
     - /usr/bin/less
     - /usr/bin/grep
diff --git a/neutron/client/service/public.yml b/neutron/client/service/public.yml
new file mode 100644
index 0000000..c3e2ca3
--- /dev/null
+++ b/neutron/client/service/public.yml
@@ -0,0 +1,25 @@
+classes:
+- service.neutron.client
+parameters:
+  neutron:
+    client:
+      server:
+        admin_identity:
+          endpoint_type: internalURL
+          network:
+            public:
+              tenant: admin
+              shared: False
+              router_external: True
+              default: True
+              admin_state_up: True
+              provider_network_type: flat
+              provider_physical_network: physnet1
+              subnet:
+                public-subnet:
+                  cidr: ${_param:openstack_public_neutron_subnet_cidr}
+                  allocation_pools:
+                    - start: ${_param:openstack_public_neutron_subnet_allocation_start}
+                      end: ${_param:openstack_public_neutron_subnet_allocation_end}
+                  gateway: ${_param:openstack_public_neutron_subnet_gateway}
+                  enable_dhcp: False
diff --git a/nova/client/service/octavia.yml b/nova/client/service/octavia.yml
index e0b6557..e31fde3 100644
--- a/nova/client/service/octavia.yml
+++ b/nova/client/service/octavia.yml
@@ -1,8 +1,6 @@
 classes:
 - service.nova.client
 parameters:
-  _param:
-    octavia_ssh_key_path: "/etc/octavia/.ssh/octavia_ssh_key.pub"
   nova:
     client:
       server:
@@ -18,4 +16,4 @@
           endpoint_type: internalURL
           keypair:
             octavia_ssh_key:
-              pub_file: ${_param:octavia_ssh_key_path}
+              pub_key: ${_param:octavia_public_key}
diff --git a/octavia/manager/single.yml b/octavia/manager/single.yml
index a7bc7a9..acab136 100644
--- a/octavia/manager/single.yml
+++ b/octavia/manager/single.yml
@@ -5,3 +5,7 @@
     manager:
       enabled: true
       version: ${_param:octavia_version}
+      ssh:
+        private_key: ${_param:octavia_private_key}
+        user: octavia
+        group: octavia
diff --git a/opencontrail/client/resource/k8s_api.yml b/opencontrail/client/resource/k8s_api.yml
index 79d6f0d..3c6102b 100644
--- a/opencontrail/client/resource/k8s_api.yml
+++ b/opencontrail/client/resource/k8s_api.yml
@@ -4,6 +4,6 @@
       linklocal_service:
         k8s_api:
           lls_ip: ${_param:kubernetes_internal_api_address}
-          lls_port: 443
+          lls_port: 6443
           ipf_addresses: ${_param:kubernetes_control_address}
           ipf_port: 443
diff --git a/opencontrail/compute/dpdk.yml b/opencontrail/compute/dpdk.yml
index b0d8e0c..049fae0 100644
--- a/opencontrail/compute/dpdk.yml
+++ b/opencontrail/compute/dpdk.yml
@@ -17,7 +17,7 @@
     system:
       package:
         liburcu4:
-          version: 0.9.1-3+tcp1
+          version: 0.9.1-3
     network:
       interface:
         vhost0:
diff --git a/openssh/server/team/k8s_apps_team.yml b/openssh/server/team/k8s_apps_team.yml
index e57ed1a..1cd8bd9 100644
--- a/openssh/server/team/k8s_apps_team.yml
+++ b/openssh/server/team/k8s_apps_team.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/k8s_team.yml b/openssh/server/team/k8s_team.yml
index 36f3252..9ec2b88 100644
--- a/openssh/server/team/k8s_team.yml
+++ b/openssh/server/team/k8s_team.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/l1_support.yml b/openssh/server/team/l1_support.yml
index aab98c7..302dd55 100644
--- a/openssh/server/team/l1_support.yml
+++ b/openssh/server/team/l1_support.yml
@@ -1,3 +1,5 @@
+## DEPRECATED, this class will be removed 01/2018
+#  please use support.yml instead
 classes:
 - system.linux.system.sudo
 # L1
@@ -23,6 +25,8 @@
 - system.openssh.server.team.members.scottmachtmes
 - system.openssh.server.team.members.zahedkhurasani
 parameters:
+  _param:
+    linux_system_user_sudo: false
   linux:
     system:
       group:
diff --git a/openssh/server/team/l2_support.yml b/openssh/server/team/l2_support.yml
index 6c54999..d231abc 100644
--- a/openssh/server/team/l2_support.yml
+++ b/openssh/server/team/l2_support.yml
@@ -1,3 +1,5 @@
+## DEPRECATED, this class will be removed 01/2018
+#  please use support3.yml instead
 classes:
 - system.linux.system.sudo
 # L2
@@ -16,6 +18,8 @@
 - system.openssh.server.team.members.oliemieshko
 - system.openssh.server.team.members.sovsianikov
 parameters:
+  _param:
+    linux_system_user_sudo: false
   linux:
     system:
       group:
diff --git a/openssh/server/team/lab.yml b/openssh/server/team/lab.yml
index 7ede7c0..b6c90f8 100644
--- a/openssh/server/team/lab.yml
+++ b/openssh/server/team/lab.yml
@@ -1,5 +1,6 @@
 parameters:
   _param:
+    linux_system_user_sudo: true
     # This is the public key associated to the default private key setup in
     # openssh.client.lab
     cluster_public_key: >-
diff --git a/openssh/server/team/mcp_ci.yml b/openssh/server/team/mcp_ci.yml
index 4bf0a5c..829839e 100644
--- a/openssh/server/team/mcp_ci.yml
+++ b/openssh/server/team/mcp_ci.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/mcp_qa.yml b/openssh/server/team/mcp_qa.yml
index 1da0d1e..e80d339 100644
--- a/openssh/server/team/mcp_qa.yml
+++ b/openssh/server/team/mcp_qa.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/members/achuprin.yml b/openssh/server/team/members/achuprin.yml
index 0fbea13..08edc89 100644
--- a/openssh/server/team/members/achuprin.yml
+++ b/openssh/server/team/members/achuprin.yml
@@ -5,7 +5,7 @@
         achuprin:
           enabled: true
           name: achuprin
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Alexey Chuprin
           home: /home/achuprin
           email: achuprin@mirantis.com
diff --git a/openssh/server/team/members/aepifanov.yml b/openssh/server/team/members/aepifanov.yml
index cb7c8e9..3c50dfe 100644
--- a/openssh/server/team/members/aepifanov.yml
+++ b/openssh/server/team/members/aepifanov.yml
@@ -9,8 +9,6 @@
           full_name: Andrey Epifanov
           home: /home/aepifanov
           email: aepifanov@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/akomarek.yml b/openssh/server/team/members/akomarek.yml
index 7fe33fb..4ccc697 100644
--- a/openssh/server/team/members/akomarek.yml
+++ b/openssh/server/team/members/akomarek.yml
@@ -5,7 +5,7 @@
         newt:
           enabled: true
           name: newt
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Ales Komarek
           home: /home/newt
           email: mail@newt.cz
diff --git a/openssh/server/team/members/aleksandrdobdin.yml b/openssh/server/team/members/aleksandrdobdin.yml
index 7739e45..6c15522 100644
--- a/openssh/server/team/members/aleksandrdobdin.yml
+++ b/openssh/server/team/members/aleksandrdobdin.yml
@@ -9,8 +9,6 @@
           full_name: Aleksandr Dobdin
           home: /home/adobdin
           email: adobdin@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/aleksandrrubtsov.yml b/openssh/server/team/members/aleksandrrubtsov.yml
index e9fb4a5..2746b80 100644
--- a/openssh/server/team/members/aleksandrrubtsov.yml
+++ b/openssh/server/team/members/aleksandrrubtsov.yml
@@ -9,8 +9,6 @@
           full_name: Aleksandr Rubtsov
           home: /home/arubtsov
           email: arubtsov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/anatoliineliubin.yml b/openssh/server/team/members/anatoliineliubin.yml
index a86785c..665b997 100644
--- a/openssh/server/team/members/anatoliineliubin.yml
+++ b/openssh/server/team/members/anatoliineliubin.yml
@@ -9,8 +9,6 @@
           full_name: Anatolii Neliubin
           home: /home/aneliubin
           email: aneliuubin@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/antonrodionov.yml b/openssh/server/team/members/antonrodionov.yml
index a4347f4..74ac724 100644
--- a/openssh/server/team/members/antonrodionov.yml
+++ b/openssh/server/team/members/antonrodionov.yml
@@ -9,8 +9,6 @@
           full_name: Anton Rodionov
           home: /home/arodionov
           email: arodionov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/apetrenko.yml b/openssh/server/team/members/apetrenko.yml
index e754a8e..7abc8cd 100644
--- a/openssh/server/team/members/apetrenko.yml
+++ b/openssh/server/team/members/apetrenko.yml
@@ -9,8 +9,6 @@
           full_name: Andrii Petrenko
           home: /home/apetrenko
           email: apetrenko@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/ashestakov.yml b/openssh/server/team/members/ashestakov.yml
index c3eae16..e00e839 100644
--- a/openssh/server/team/members/ashestakov.yml
+++ b/openssh/server/team/members/ashestakov.yml
@@ -5,7 +5,7 @@
         ashestakov:
           enabled: true
           name: ashestakov
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Andrey Shestakov
           home: /home/ashestakov
           email: ashestakov@mirantis.com
diff --git a/openssh/server/team/members/ashishkin.yml b/openssh/server/team/members/ashishkin.yml
index e9a132e..b85c953 100644
--- a/openssh/server/team/members/ashishkin.yml
+++ b/openssh/server/team/members/ashishkin.yml
@@ -9,8 +9,6 @@
           full_name: Aleksei Shishkin
           home: /home/ashishkin
           email: ashishkin@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/atarasov.yml b/openssh/server/team/members/atarasov.yml
index deada75..8ada998 100644
--- a/openssh/server/team/members/atarasov.yml
+++ b/openssh/server/team/members/atarasov.yml
@@ -9,8 +9,6 @@
           full_name: Anton Tarasov
           home: /home/atarasov
           email: atarasov@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/atengler.yml b/openssh/server/team/members/atengler.yml
index cf06e02..34ef793 100644
--- a/openssh/server/team/members/atengler.yml
+++ b/openssh/server/team/members/atengler.yml
@@ -5,7 +5,7 @@
         tux:
           enabled: true
           name: tux
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Adam Tengler
           home: /home/tux
           email: atengler@mirantis.com
diff --git a/openssh/server/team/members/cade.yml b/openssh/server/team/members/cade.yml
index dd50b54..6b14ff3 100644
--- a/openssh/server/team/members/cade.yml
+++ b/openssh/server/team/members/cade.yml
@@ -5,7 +5,7 @@
         cade:
           enabled: true
           name: cade
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Cade Ekblad-Frank
           home: /home/cade
           email: cade@mirantis.com
diff --git a/openssh/server/team/members/collinmay.yml b/openssh/server/team/members/collinmay.yml
index cf55e05..f884652 100644
--- a/openssh/server/team/members/collinmay.yml
+++ b/openssh/server/team/members/collinmay.yml
@@ -9,8 +9,6 @@
           full_name: Collin May
           home: /home/cmay
           email: cmay@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/daniillapshin.yml b/openssh/server/team/members/daniillapshin.yml
index da1a274..56dfa4c 100644
--- a/openssh/server/team/members/daniillapshin.yml
+++ b/openssh/server/team/members/daniillapshin.yml
@@ -9,8 +9,6 @@
           full_name: Daniil Lapshin
           home: /home/dlapshin
           email: dlapshin@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/danilakhmetov.yml b/openssh/server/team/members/danilakhmetov.yml
index 1835188..a883b4e 100644
--- a/openssh/server/team/members/danilakhmetov.yml
+++ b/openssh/server/team/members/danilakhmetov.yml
@@ -9,8 +9,6 @@
           full_name: Danil Akhmetov
           home: /home/dakhmetov
           email: dakhmetov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/dcech.yml b/openssh/server/team/members/dcech.yml
index 4e6dedf..2d29118 100644
--- a/openssh/server/team/members/dcech.yml
+++ b/openssh/server/team/members/dcech.yml
@@ -5,7 +5,7 @@
         dcech:
           enabled: true
           name: dcech
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Daniel Cech
           home: /home/dcech
           email: dcech@mirantis.com
diff --git a/openssh/server/team/members/deniskostriukov.yml b/openssh/server/team/members/deniskostriukov.yml
index 1f03ef3..e25514a 100644
--- a/openssh/server/team/members/deniskostriukov.yml
+++ b/openssh/server/team/members/deniskostriukov.yml
@@ -9,8 +9,6 @@
           full_name: Denis Kostriukov
           home: /home/dkostriukov
           email: dkostryukov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/dklepikov.yml b/openssh/server/team/members/dklepikov.yml
index e1eeb76..6e989c1 100644
--- a/openssh/server/team/members/dklepikov.yml
+++ b/openssh/server/team/members/dklepikov.yml
@@ -9,8 +9,6 @@
           full_name: Denys Klepikov
           home: /home/dklepikov
           email: dklepikov@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/dmitrygoloshubov.yml b/openssh/server/team/members/dmitrygoloshubov.yml
index d9e242c..1870fac 100644
--- a/openssh/server/team/members/dmitrygoloshubov.yml
+++ b/openssh/server/team/members/dmitrygoloshubov.yml
@@ -9,8 +9,6 @@
           full_name: Dmitry Goloshubov
           home: /home/dgoloshubov
           email: dgoloshubov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/dsutyagin.yml b/openssh/server/team/members/dsutyagin.yml
index 66225c0..3e332f0 100644
--- a/openssh/server/team/members/dsutyagin.yml
+++ b/openssh/server/team/members/dsutyagin.yml
@@ -9,8 +9,6 @@
           full_name: Dmitry Sutyagin
           home: /home/dsutyagin
           email: dsutyagin@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/dszeluga.yml b/openssh/server/team/members/dszeluga.yml
index 72c7db4..6557eac 100644
--- a/openssh/server/team/members/dszeluga.yml
+++ b/openssh/server/team/members/dszeluga.yml
@@ -1,11 +1,12 @@
+##Disabled user
 parameters:
   linux:
     system:
       user:
         dszeluga:
-          enabled: true
+          enabled: false
           name: dszeluga
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Damian Szeluga
           home: /home/dszeluga
           email: dszeluga@mirantis.com
diff --git a/openssh/server/team/members/ecantwell.yml b/openssh/server/team/members/ecantwell.yml
index 68bb110..309c40b 100644
--- a/openssh/server/team/members/ecantwell.yml
+++ b/openssh/server/team/members/ecantwell.yml
@@ -5,7 +5,7 @@
         ecantwell:
           enabled: true
           name: ecantwell
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Erick Cantwell
           home: /home/ecantwell
           email: ecantwell@mirantis.com
diff --git a/openssh/server/team/members/ekozhemyakin.yml b/openssh/server/team/members/ekozhemyakin.yml
index 5f7e3f8..607d3c7 100644
--- a/openssh/server/team/members/ekozhemyakin.yml
+++ b/openssh/server/team/members/ekozhemyakin.yml
@@ -9,8 +9,6 @@
           full_name: Evgeny Kozhemyakin
           home: /home/ekozhemyakin
           email: ekozhemyakin@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/enikanorov.yml b/openssh/server/team/members/enikanorov.yml
index 5697fa7..4a93b8c 100644
--- a/openssh/server/team/members/enikanorov.yml
+++ b/openssh/server/team/members/enikanorov.yml
@@ -9,8 +9,6 @@
           full_name: Eugene Nikanorov
           home: /home/enikanorov
           email: enikanorov@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/fpytloun.yml b/openssh/server/team/members/fpytloun.yml
index 8cdfcec..d5b0937 100644
--- a/openssh/server/team/members/fpytloun.yml
+++ b/openssh/server/team/members/fpytloun.yml
@@ -5,7 +5,7 @@
         filip:
           enabled: true
           name: filip
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Filip Pytloun
           home: /home/filip
           email: filip@pytloun.cz
diff --git a/openssh/server/team/members/fsoppelsa.yml b/openssh/server/team/members/fsoppelsa.yml
index 6806a0e..ec7398a 100644
--- a/openssh/server/team/members/fsoppelsa.yml
+++ b/openssh/server/team/members/fsoppelsa.yml
@@ -9,8 +9,6 @@
           full_name: Fabrizio Soppelsa
           home: /home/fsoppelsa
           email: fsoppelsa@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/javierdiaz.yml b/openssh/server/team/members/javierdiaz.yml
index 8d1e765..ebdf6dc 100644
--- a/openssh/server/team/members/javierdiaz.yml
+++ b/openssh/server/team/members/javierdiaz.yml
@@ -9,8 +9,6 @@
           full_name: Javier Diaz
           home: /home/jdiaz
           email: jdiaz@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/jbroulik.yml b/openssh/server/team/members/jbroulik.yml
index d7cfcff..6b25ae9 100644
--- a/openssh/server/team/members/jbroulik.yml
+++ b/openssh/server/team/members/jbroulik.yml
@@ -5,7 +5,7 @@
         jbroulik:
           enabled: true
           name: jbroulik
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Jiri Broulik
           home: /home/jbroulik
           email: jbroulik@mirantis.com
diff --git a/openssh/server/team/members/jcach.yml b/openssh/server/team/members/jcach.yml
index 8ab2a81..a9e7e6d 100644
--- a/openssh/server/team/members/jcach.yml
+++ b/openssh/server/team/members/jcach.yml
@@ -5,7 +5,7 @@
         jcach:
           enabled: true
           name: jcach
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Jan Cach
           home: /home/jcach
           email: jcach@mirantis.com
diff --git a/openssh/server/team/members/jjosef.yml b/openssh/server/team/members/jjosef.yml
index 210162a..df6d0dd 100644
--- a/openssh/server/team/members/jjosef.yml
+++ b/openssh/server/team/members/jjosef.yml
@@ -5,7 +5,7 @@
         jjosef:
           enabled: true
           name: jjosef
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Jakub Josef
           home: /home/jjosef
           email: jakub.josef@gmail.com
diff --git a/openssh/server/team/members/jmosher.yml b/openssh/server/team/members/jmosher.yml
index 00535b4..f30c92f 100644
--- a/openssh/server/team/members/jmosher.yml
+++ b/openssh/server/team/members/jmosher.yml
@@ -5,7 +5,7 @@
         jmosher:
           enabled: true
           name: jmosher
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Jaymes Mosher
           home: /home/jmosher
           email: jmosher@mirantis.com
diff --git a/openssh/server/team/members/josuepalmerin.yml b/openssh/server/team/members/josuepalmerin.yml
index 72f3eda..fdcacbe 100644
--- a/openssh/server/team/members/josuepalmerin.yml
+++ b/openssh/server/team/members/josuepalmerin.yml
@@ -9,8 +9,6 @@
           full_name: Josue Palmerin
           home: /home/jpalmerin
           email: jpalmerin@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/jpavlik.yml b/openssh/server/team/members/jpavlik.yml
index 135db8c..b073d7f 100644
--- a/openssh/server/team/members/jpavlik.yml
+++ b/openssh/server/team/members/jpavlik.yml
@@ -5,7 +5,7 @@
         jpavlik:
           enabled: true
           name: jpavlik
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Jakub Pavlik
           home: /home/jpavlik
           email: jpavlik@mirantis.com
diff --git a/openssh/server/team/members/korlowska.yml b/openssh/server/team/members/korlowska.yml
index 7b1c151..f175273 100644
--- a/openssh/server/team/members/korlowska.yml
+++ b/openssh/server/team/members/korlowska.yml
@@ -5,7 +5,7 @@
         korlowska:
           enabled: true
           name: korlowska
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Katarzyna Orlowska
           home: /home/korlowska
           email: korlowska@mirantis.com
diff --git a/openssh/server/team/members/krzysztoffranckowski.yml b/openssh/server/team/members/krzysztoffranckowski.yml
index 72edd3f..5158f94 100644
--- a/openssh/server/team/members/krzysztoffranckowski.yml
+++ b/openssh/server/team/members/krzysztoffranckowski.yml
@@ -9,8 +9,6 @@
           full_name: Krzysztof Franckowski
           home: /home/kfranckowski
           email: kfranckowski@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/lmercl.yml b/openssh/server/team/members/lmercl.yml
index 4fd4707..c735ed5 100644
--- a/openssh/server/team/members/lmercl.yml
+++ b/openssh/server/team/members/lmercl.yml
@@ -5,7 +5,7 @@
         lmercl:
           enabled: true
           name: lmercl
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Lubos Mercl
           home: /home/lmercl
           email: lmercl@mirantis.com
diff --git a/openssh/server/team/members/manashkin.yml b/openssh/server/team/members/manashkin.yml
index bfce163..a28342b 100644
--- a/openssh/server/team/members/manashkin.yml
+++ b/openssh/server/team/members/manashkin.yml
@@ -9,8 +9,6 @@
           full_name: Miroslav Anashkin
           home: /home/manashkin
           email: manashkin@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
@@ -21,4 +19,3 @@
           - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDb1XOAU6ZoU+hSB0SPaypwK1Weu2armLzQrIQ3hhmlpAxFDV50oiF/PyPZ7W5NkJWgEr+DGYuZiKuqTDosrQV5Tt8TA4nt6bSJ9SlhJlNGltrOeWeLcP/Hf2YyWm0e9puzAIgUsKN8Np+CBrpIls4bq2JCshkz/vz9AreaFBMHrhjrh8YNn+yNbETJf9nmxDazVqYp3UI5SU4Wg0KchrFHBPNlREL099SSARfTGIsfbbJmSHx2LUw3Rt6v2fizRslv+Tuxvx2tqRsgbjeF7+NKfOFMBIloab97ag7N9EUdVvOHrjScXQ+nP/kdk3iq7O2WDpAgKYXIbSuaWA0YUk5Z manashkin@mirantis.com
           user: ${linux:system:user:manashkin}
           group:
-          - supportl2
diff --git a/openssh/server/team/members/matthewroark.yml b/openssh/server/team/members/matthewroark.yml
index 0a9eb28..97064db 100644
--- a/openssh/server/team/members/matthewroark.yml
+++ b/openssh/server/team/members/matthewroark.yml
@@ -9,8 +9,6 @@
           full_name: Matthew Roark
           home: /home/mroark
           email: mroark@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/maximefimov.yml b/openssh/server/team/members/maximefimov.yml
index 2dab7d7..48d0c90 100644
--- a/openssh/server/team/members/maximefimov.yml
+++ b/openssh/server/team/members/maximefimov.yml
@@ -9,8 +9,6 @@
           full_name: Maxim Efimov
           home: /home/mefimov
           email: mefimov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/mceloud.yml b/openssh/server/team/members/mceloud.yml
index 62dc444..d1f3359 100644
--- a/openssh/server/team/members/mceloud.yml
+++ b/openssh/server/team/members/mceloud.yml
@@ -5,7 +5,7 @@
         marco:
           enabled: true
           name: marco
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Marek Celoud
           home: /home/marco
           email: mceloud@mirantis.com
diff --git a/openssh/server/team/members/michaelpetersen.yml b/openssh/server/team/members/michaelpetersen.yml
index 8174b6b..bab536f 100644
--- a/openssh/server/team/members/michaelpetersen.yml
+++ b/openssh/server/team/members/michaelpetersen.yml
@@ -9,8 +9,6 @@
           full_name: Michael Petersen
           home: /home/mpetersen
           email: mpetersen@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/mikhailkraynov.yml b/openssh/server/team/members/mikhailkraynov.yml
index 0019a41..39c58e6 100644
--- a/openssh/server/team/members/mikhailkraynov.yml
+++ b/openssh/server/team/members/mikhailkraynov.yml
@@ -9,8 +9,6 @@
           full_name: Mikhail Kraynov
           home: /home/mkraynov
           email: mkraynov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/miwinski.yml b/openssh/server/team/members/miwinski.yml
index 48f91e9..5dc9d80 100644
--- a/openssh/server/team/members/miwinski.yml
+++ b/openssh/server/team/members/miwinski.yml
@@ -5,7 +5,7 @@
         miwinski:
           enabled: true
           name: miwinski
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Marcin Iwinski
           home: /home/miwinski
           email: miwinski@mirantis.com
diff --git a/openssh/server/team/members/mkarpin.yml b/openssh/server/team/members/mkarpin.yml
new file mode 100644
index 0000000..32cc689
--- /dev/null
+++ b/openssh/server/team/members/mkarpin.yml
@@ -0,0 +1,20 @@
+parameters:
+  linux:
+    system:
+      user:
+        mkarpin:
+          enabled: true
+          name: mkarpin
+          sudo: true
+          full_name: Mykyta Karpin
+          home: /home/mkarpin
+          email: mkarpin@mirantis.com
+  openssh:
+    server:
+      enabled: true
+      user:
+        mkarpin:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCcO+qMO4z5O75JmeoyHQKNjq72psAMO2lebEMl5MbgVs7BAOT3PChamRId3xhwX2X5R0vS1ZSgRm0XC4br2OpJ9DsBhOBbPRK/EyjAm5aTBW8eZZ69NDFam/hLJ6Xq+jZDdlBT8iK7CPxTJD+0wz1KqpIgYlUNkix5EEj2wfUAfw3j6lGiEVQ0Cpbejey9sYlUSitKcYs/EAX5byBBqkFCLL4/D77fLOIuWfDzAAStUR/wbOJnWNiIScifu4EUdcSdHra9RoQaRgo31ALq+BeYVpvqnyHTOw9t2q04sZVDN4anhUMAFh0n1CkbY/2HWpX/RYWt1bV6XtDeoCpsC5Ar nkarpin@nkarpin-pc
+          user: ${linux:system:user:mkarpin}
\ No newline at end of file
diff --git a/openssh/server/team/members/mlos.yml b/openssh/server/team/members/mlos.yml
index 1e9da38..6b30817 100644
--- a/openssh/server/team/members/mlos.yml
+++ b/openssh/server/team/members/mlos.yml
@@ -5,7 +5,7 @@
         mlos:
           enabled: true
           name: mlos
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Mateusz Los
           home: /home/mlos
           email: mlos@mirantis.com
diff --git a/openssh/server/team/members/mpolreich.yml b/openssh/server/team/members/mpolreich.yml
index 8a01168..a4658aa 100644
--- a/openssh/server/team/members/mpolreich.yml
+++ b/openssh/server/team/members/mpolreich.yml
@@ -5,7 +5,7 @@
         mpolreich:
           enabled: true
           name: mpolreich
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Martin Polreich
           home: /home/mpolreich
           email: mpolreich@mirantis.com
diff --git a/openssh/server/team/members/mrelewicz.yml b/openssh/server/team/members/mrelewicz.yml
index 7e863e2..144379b 100644
--- a/openssh/server/team/members/mrelewicz.yml
+++ b/openssh/server/team/members/mrelewicz.yml
@@ -1,11 +1,12 @@
+##Disabled user
 parameters:
   linux:
     system:
       user:
         mrelewicz:
-          enabled: true
+          enabled: false
           name: mrelewicz
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Maciej Relewicz
           home: /home/mrelewicz
           email: mrelewicz@mirantis.com
diff --git a/openssh/server/team/members/mwilson.yml b/openssh/server/team/members/mwilson.yml
index f9280eb..720edf3 100644
--- a/openssh/server/team/members/mwilson.yml
+++ b/openssh/server/team/members/mwilson.yml
@@ -5,7 +5,7 @@
         mwilson:
           enabled: true
           name: mwilson
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Mike Wilson
           home: /home/mwilson
           email: mwilson@mirantis.com
diff --git a/openssh/server/team/members/nadezhdakabanova.yml b/openssh/server/team/members/nadezhdakabanova.yml
index 6979c5e..dee01e0 100644
--- a/openssh/server/team/members/nadezhdakabanova.yml
+++ b/openssh/server/team/members/nadezhdakabanova.yml
@@ -9,8 +9,6 @@
           full_name: Nadezhda Kabanova
           home: /home/nkabanova
           email: nkabanova@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/nkondra.yml b/openssh/server/team/members/nkondra.yml
index 77bfde5..a6437de 100644
--- a/openssh/server/team/members/nkondra.yml
+++ b/openssh/server/team/members/nkondra.yml
@@ -9,8 +9,6 @@
           full_name: Nazarii Kondra
           home: /home/nkondra
           email: nkondra@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/obryndzii.yml b/openssh/server/team/members/obryndzii.yml
index 85763b3..db0f630 100644
--- a/openssh/server/team/members/obryndzii.yml
+++ b/openssh/server/team/members/obryndzii.yml
@@ -9,8 +9,6 @@
           full_name: Oleksandr Bryndzii
           home: /home/obryndzii
           email: obryndzii@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/oliemieshko.yml b/openssh/server/team/members/oliemieshko.yml
index fdf52c7..5050d53 100644
--- a/openssh/server/team/members/oliemieshko.yml
+++ b/openssh/server/team/members/oliemieshko.yml
@@ -9,8 +9,6 @@
           full_name: Oleksandr Liemieshko
           home: /home/oliemieshko
           email: oliemieshko@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/osmola.yml b/openssh/server/team/members/osmola.yml
index 653027b..2083ddf 100644
--- a/openssh/server/team/members/osmola.yml
+++ b/openssh/server/team/members/osmola.yml
@@ -5,7 +5,7 @@
         osmola:
           enabled: true
           name: osmola
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Ondrej Smola
           home: /home/osmola
           email: osmola@mirantis.com
diff --git a/openssh/server/team/members/pcizinsky.yml b/openssh/server/team/members/pcizinsky.yml
index d702687..e9870c3 100644
--- a/openssh/server/team/members/pcizinsky.yml
+++ b/openssh/server/team/members/pcizinsky.yml
@@ -5,7 +5,7 @@
         pcizinsky:
           enabled: true
           name: pcizinsky
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Pavel Cizinsky
           home: /home/pcizinsky
           email: pcizinsky@mirantis.com
diff --git a/openssh/server/team/members/pjediny.yml b/openssh/server/team/members/pjediny.yml
index 7a4b17d..968ec33 100644
--- a/openssh/server/team/members/pjediny.yml
+++ b/openssh/server/team/members/pjediny.yml
@@ -5,7 +5,7 @@
         pjediny:
           enabled: true
           name: pjediny
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Petr Jediny
           home: /home/pjediny
           email: pjediny@mirantis.com
diff --git a/openssh/server/team/members/pmathews.yml b/openssh/server/team/members/pmathews.yml
index 0e1761e..91904a7 100644
--- a/openssh/server/team/members/pmathews.yml
+++ b/openssh/server/team/members/pmathews.yml
@@ -5,7 +5,7 @@
         pmathews:
           enabled: true
           name: pmathews
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Paul Mathews
           home: /home/pmathews
           email: pmathews@mirantis.com
diff --git a/openssh/server/team/members/pmichalec.yml b/openssh/server/team/members/pmichalec.yml
index c397cd4..b9b9c90 100644
--- a/openssh/server/team/members/pmichalec.yml
+++ b/openssh/server/team/members/pmichalec.yml
@@ -5,7 +5,7 @@
         pmichalec:
           enabled: true
           name: pmichalec
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Petr Michalec
           home: /home/pmichalec
           email: pmichalec@mirantis.com
diff --git a/openssh/server/team/members/psvimbersky.yml b/openssh/server/team/members/psvimbersky.yml
new file mode 100644
index 0000000..2fc10b1
--- /dev/null
+++ b/openssh/server/team/members/psvimbersky.yml
@@ -0,0 +1,20 @@
+parameters:
+  linux:
+    system:
+      user:
+        psvimbersky:
+          enabled: true
+          name: psvimbersky
+          sudo: true
+          full_name: Pavel Svimbersky
+          home: /home/psvimbersky
+          email: psvimbersky@mirantis.com
+  openssh:
+    server:
+      enabled: true
+      user:
+        psvimbersky:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnsI2H2xgNFttWvGaIa7UdXtgAnlGMpin1/sBufx/bYkDMU2r0xGDjIBbUNWc4/OSKhpDyJiwxT5qiln07uFDBw0PtHUlJYHpJgS9xE6PERZPEiyQqrmbUVdqX9bIimweMH8kJIXjKgut+pc+GLUs5SyUlkjlHbKuYoYo52jAx+ldAslKK0P/aA1msjzGpoDRSvFChew7FHs9sH0GTgX865DoqCzqulNjHiGUrziBxwEAdUVjNDfxFHROm6kgdFU7ipgNQTHB7NvEI/VfZFlcuZ9IWZQhLQiw1jSxs4zAxOYJWrELPUqhPYE5yB5Y9j8iP4b0xIKhwoWkxQxdYuaLB
+          user: ${linux:system:user:psvimbersky}
diff --git a/openssh/server/team/members/renesoto.yml b/openssh/server/team/members/renesoto.yml
index ad76260..9fcace6 100644
--- a/openssh/server/team/members/renesoto.yml
+++ b/openssh/server/team/members/renesoto.yml
@@ -9,8 +9,6 @@
           full_name: Rene Soto
           home: /home/rsoto
           email: rsoto@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/rfelkl.yml b/openssh/server/team/members/rfelkl.yml
index 1b7fbf4..a2151f9 100644
--- a/openssh/server/team/members/rfelkl.yml
+++ b/openssh/server/team/members/rfelkl.yml
@@ -5,7 +5,7 @@
         rfelkl:
           enabled: true
           name: rfelkl
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Richard Felkl
           home: /home/rfelkl
           email: rfelkl@mirantis.com
diff --git a/openssh/server/team/members/rsafonov.yml b/openssh/server/team/members/rsafonov.yml
index 5569975..3409c92 100644
--- a/openssh/server/team/members/rsafonov.yml
+++ b/openssh/server/team/members/rsafonov.yml
@@ -9,8 +9,6 @@
           full_name: Roman Safonov
           home: /home/rsafonov
           email: rsafonov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/rsatek.yml b/openssh/server/team/members/rsatek.yml
index 7968ee7..227d20d 100644
--- a/openssh/server/team/members/rsatek.yml
+++ b/openssh/server/team/members/rsatek.yml
@@ -5,7 +5,7 @@
         rsatek:
           enabled: true
           name: rsatek
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Rudolf Satek
           home: /home/rsatek
           email: rsatek@mirantis.com
@@ -17,4 +17,4 @@
           enabled: true
           public_keys:
             - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC63DK9CdBB2WNHcbgzReBlcVY7YDvVKBJI4P5O8N3lg/T+01ROL99/6k8drFYFJjdeXJaMkCg7UM17yIyouDijBHB9G9AM7jkefBZrGDF7QaWJeGvpxB9W3BQnhotCeuP363CNBup+oUfPwXVnkE5iGuLJAGS8SENpVZpZsF0gXAUuVtvl5D8h1wIqQtFveJSV6qJkjVIudZYJfOMDBfiyS5nEwKmboP5jFtrm3e64HpxDhm2J5irNtzw3hOO8cq2ssnZ0ZAHFf2FfnPAzZ2L0Z1MpZcEPdzBonsdO8/cfxdbov9hW4iLmpJF80KxgPyHU0R304uyfnsfkC164l0Rx rsatek@Rudolfs-MacBook-Pro.local
-            user: ${linux:system:user:rsatek}
+          user: ${linux:system:user:rsatek}
diff --git a/openssh/server/team/members/scottmachtmes.yml b/openssh/server/team/members/scottmachtmes.yml
index 6feb7a2..a08b3a7 100644
--- a/openssh/server/team/members/scottmachtmes.yml
+++ b/openssh/server/team/members/scottmachtmes.yml
@@ -9,8 +9,6 @@
           full_name: Scott Machtmes
           home: /home/smachtmes
           email: smachtmes@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/sflorczak.yml b/openssh/server/team/members/sflorczak.yml
index d340089..152fe39 100644
--- a/openssh/server/team/members/sflorczak.yml
+++ b/openssh/server/team/members/sflorczak.yml
@@ -5,7 +5,7 @@
         sflorczak:
           enabled: true
           name: sflorczak
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Szymon Florczak
           home: /home/sflorczak
           email: sflorczak@mirantis.com
diff --git a/openssh/server/team/members/skreys.yml b/openssh/server/team/members/skreys.yml
index df76889..19a0f70 100644
--- a/openssh/server/team/members/skreys.yml
+++ b/openssh/server/team/members/skreys.yml
@@ -5,7 +5,7 @@
         skreys:
           enabled: true
           name: skreys
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Sergey Kreys
           home: /home/skreys
           email: skreys@mirantis.com
diff --git a/openssh/server/team/members/smatov.yml b/openssh/server/team/members/smatov.yml
index 8c21e28..073b02f 100644
--- a/openssh/server/team/members/smatov.yml
+++ b/openssh/server/team/members/smatov.yml
@@ -5,7 +5,7 @@
         smatov:
           enabled: true
           name: smatov
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Sergey Matov
           home: /home/smatov
           email: smatov@mirantis.com
diff --git a/openssh/server/team/members/sovsianikov.yml b/openssh/server/team/members/sovsianikov.yml
index 646bde9..cb82cc9 100644
--- a/openssh/server/team/members/sovsianikov.yml
+++ b/openssh/server/team/members/sovsianikov.yml
@@ -9,8 +9,6 @@
           full_name: Serhii Ovsianikov
           home: /home/sovsianikov
           email: sovsianikov@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/tkukral.yml b/openssh/server/team/members/tkukral.yml
index e53ce2d..60b34f5 100644
--- a/openssh/server/team/members/tkukral.yml
+++ b/openssh/server/team/members/tkukral.yml
@@ -5,7 +5,7 @@
         tkukral:
           enabled: true
           name: tkukral
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Tomas Kukral
           home: /home/tkukral
           email: tkukral@mirantis.com
diff --git a/openssh/server/team/members/vmikes.yml b/openssh/server/team/members/vmikes.yml
index 07d62f3..eb506ac 100644
--- a/openssh/server/team/members/vmikes.yml
+++ b/openssh/server/team/members/vmikes.yml
@@ -5,7 +5,7 @@
         vmikes:
           enabled: true
           name: vmikes
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Vlasta Mikes
           home: /home/vmikes
           email: vmikes@mirantis.com
diff --git a/openssh/server/team/members/vnogin.yml b/openssh/server/team/members/vnogin.yml
index e8c1df9..26f9106 100644
--- a/openssh/server/team/members/vnogin.yml
+++ b/openssh/server/team/members/vnogin.yml
@@ -5,7 +5,7 @@
         vnogin:
           enabled: true
           name: vnogin
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Vitaliy Nogin
           home: /home/vnogin
           email: vnogin@mirantis.com
diff --git a/openssh/server/team/members/vsaienko.yml b/openssh/server/team/members/vsaienko.yml
index bd532f6..d47a4a6 100644
--- a/openssh/server/team/members/vsaienko.yml
+++ b/openssh/server/team/members/vsaienko.yml
@@ -5,7 +5,7 @@
         vsaienko:
           enabled: true
           name: vsaienko
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Vasyl Saienko
           home: /home/vsaienko
           email: vsaienko@mirantis.com
diff --git a/openssh/server/team/members/zahedkhurasani.yml b/openssh/server/team/members/zahedkhurasani.yml
index 8504005..df1a94d 100644
--- a/openssh/server/team/members/zahedkhurasani.yml
+++ b/openssh/server/team/members/zahedkhurasani.yml
@@ -9,8 +9,6 @@
           full_name: Zahed Khurasani
           home: /home/zkhurasani
           email: zkhurasani@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/mmo_devops.yml b/openssh/server/team/mmo_devops.yml
index 60fe258..1fe82c6 100644
--- a/openssh/server/team/mmo_devops.yml
+++ b/openssh/server/team/mmo_devops.yml
@@ -1,11 +1,9 @@
 classes:
 # DevOps/SRE Team
 - system.openssh.server.team.members.cade
-- system.openssh.server.team.members.dszeluga
 - system.openssh.server.team.members.jmosher
 - system.openssh.server.team.members.ecantwell
 - system.openssh.server.team.members.lmercl
-- system.openssh.server.team.members.mrelewicz
 - system.openssh.server.team.members.mwilson
 - system.openssh.server.team.members.osmola
 - system.openssh.server.team.members.pcizinsky
@@ -13,3 +11,6 @@
 - system.openssh.server.team.members.pmichalec
 # Missing- team members still in flux
 # - system.openssh.server.team.members.bpiotrowski
+parameters:
+  _param:
+    linux_system_user_sudo: true
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index df85109..f64d69c 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 2ba780a..149d765 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -3,3 +3,7 @@
 - system.openssh.server.team.members.vsaienko
 - system.openssh.server.team.members.vnogin
 - system.openssh.server.team.members.ashestakov
+- system.openssh.server.team.members.mkarpin
+parameters:
+  _param:
+    linux_system_user_sudo: true
diff --git a/openssh/server/team/oss_team.yml b/openssh/server/team/oss_team.yml
index db4dbbd..d5ba940 100644
--- a/openssh/server/team/oss_team.yml
+++ b/openssh/server/team/oss_team.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/presales.yml b/openssh/server/team/presales.yml
index 7efc9da..e2939be 100644
--- a/openssh/server/team/presales.yml
+++ b/openssh/server/team/presales.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/qa_scale.yml b/openssh/server/team/qa_scale.yml
index 51fb260..a3f4a91 100644
--- a/openssh/server/team/qa_scale.yml
+++ b/openssh/server/team/qa_scale.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
@@ -20,4 +22,4 @@
           user: ${linux:system:user:dburnazyan}
   public_keys:
     dburnazyan:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4xJvnHle7Omjhnv8AsqfXlp1Sg4Ixq/p0Dpcj5SlGN5YTnIs+eRXwy7WHICCgWC1OA+o4omzWQI486u0C4qMkdv+nvuAsvJQVRGNiGVp4gi48x3KqMxlEzeCScMH5oj+W5LJLcb2czHulBPXRluKlITOlF4i5+z3GbFwb8Dg5hBnnbxhhRyh6XyUOh8WQvBqXAk2EqY8vqYAZxV9DXI8OSIYsvpM9jQo/26YrSoTWZ4caCNmL6zVVH7eXaqEzVwDHxpXHLvzSP4bIl85dKygJI1DyN9mZ1B77z1lNZnk7Fu8yQP05Guln5Hzg+VqycAZxOk6ysjRXiYNu56DVZuc3 dburnazyan@dburnazyan-pc.msk.mirantis.net
\ No newline at end of file
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4xJvnHle7Omjhnv8AsqfXlp1Sg4Ixq/p0Dpcj5SlGN5YTnIs+eRXwy7WHICCgWC1OA+o4omzWQI486u0C4qMkdv+nvuAsvJQVRGNiGVp4gi48x3KqMxlEzeCScMH5oj+W5LJLcb2czHulBPXRluKlITOlF4i5+z3GbFwb8Dg5hBnnbxhhRyh6XyUOh8WQvBqXAk2EqY8vqYAZxV9DXI8OSIYsvpM9jQo/26YrSoTWZ4caCNmL6zVVH7eXaqEzVwDHxpXHLvzSP4bIl85dKygJI1DyN9mZ1B77z1lNZnk7Fu8yQP05Guln5Hzg+VqycAZxOk6ysjRXiYNu56DVZuc3 dburnazyan@dburnazyan-pc.msk.mirantis.net
diff --git a/openssh/server/team/services_qa.yml b/openssh/server/team/services_qa.yml
index ca75b5a..3e64bd3 100644
--- a/openssh/server/team/services_qa.yml
+++ b/openssh/server/team/services_qa.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/stacklight.yml b/openssh/server/team/stacklight.yml
index 84a8255..1133135 100644
--- a/openssh/server/team/stacklight.yml
+++ b/openssh/server/team/stacklight.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
new file mode 100644
index 0000000..30382a3
--- /dev/null
+++ b/openssh/server/team/support.yml
@@ -0,0 +1,176 @@
+classes:
+- system.linux.system.sudo
+# L1
+- system.openssh.server.team.members.aleksandrdobdin
+- system.openssh.server.team.members.aleksandrrubtsov
+- system.openssh.server.team.members.anatoliineliubin
+- system.openssh.server.team.members.antonrodionov
+- system.openssh.server.team.members.collinmay
+- system.openssh.server.team.members.danilakhmetov
+- system.openssh.server.team.members.deniskostriukov
+- system.openssh.server.team.members.dmitrygoloshubov
+- system.openssh.server.team.members.javierdiaz
+- system.openssh.server.team.members.josuepalmerin
+- system.openssh.server.team.members.krzysztoffranckowski
+- system.openssh.server.team.members.matthewroark
+- system.openssh.server.team.members.maximefimov
+- system.openssh.server.team.members.mikhailkraynov
+- system.openssh.server.team.members.nadezhdakabanova
+- system.openssh.server.team.members.renesoto
+- system.openssh.server.team.members.rsafonov
+- system.openssh.server.team.members.scottmachtmes
+- system.openssh.server.team.members.zahedkhurasani
+# L2OPS
+- system.openssh.server.team.members.aepifanov
+- system.openssh.server.team.members.apetrenko
+- system.openssh.server.team.members.atarasov
+- system.openssh.server.team.members.dklepikov
+- system.openssh.server.team.members.dsutyagin
+- system.openssh.server.team.members.ekozhemyakin
+- system.openssh.server.team.members.enikanorov
+- system.openssh.server.team.members.fsoppelsa
+- system.openssh.server.team.members.manashkin
+- system.openssh.server.team.members.nkondra
+- system.openssh.server.team.members.obryndzii
+- system.openssh.server.team.members.oliemieshko
+- system.openssh.server.team.members.sovsianikov
+# L2OPS SRE Team
+- system.openssh.server.team.members.cade
+- system.openssh.server.team.members.jmosher
+- system.openssh.server.team.members.ecantwell
+- system.openssh.server.team.members.lmercl
+- system.openssh.server.team.members.osmola
+- system.openssh.server.team.members.pcizinsky
+- system.openssh.server.team.members.pmathews
+- system.openssh.server.team.members.pmichalec
+parameters:
+  _param:
+    linux_system_user_sudo: false
+  linux:
+    system:
+      group:
+        supportl1:
+          enabled: false
+        supportl2:
+          enabled: false
+        support0:
+          enabled: true
+          name: support0
+        support1:
+          enabled: true
+          name: support1
+          addusers:
+            # L1
+            - ${linux:system:user:adobdin:name}
+            - ${linux:system:user:arubtsov:name}
+            - ${linux:system:user:aneliubin:name}
+            - ${linux:system:user:arodionov:name}
+            - ${linux:system:user:cmay:name}
+            - ${linux:system:user:dakhmetov:name}
+            - ${linux:system:user:dkostriukov:name}
+            - ${linux:system:user:dgoloshubov:name}
+            - ${linux:system:user:jdiaz:name}
+            - ${linux:system:user:jpalmerin:name}
+            - ${linux:system:user:kfranckowski:name}
+            - ${linux:system:user:mroark:name}
+            - ${linux:system:user:mefimov:name}
+            - ${linux:system:user:mkraynov:name}
+            - ${linux:system:user:nkabanova:name}
+            - ${linux:system:user:rsoto:name}
+            - ${linux:system:user:rsafonov:name}
+            - ${linux:system:user:smachtmes:name}
+            - ${linux:system:user:zkhurasani:name}
+        support2:
+          enabled: true
+          name: support2
+          addusers:
+            # L2OPS
+            - ${linux:system:user:aepifanov:name}
+            - ${linux:system:user:apetrenko:name}
+            - ${linux:system:user:atarasov:name}
+            - ${linux:system:user:dklepikov:name}
+            - ${linux:system:user:dsutyagin:name}
+            - ${linux:system:user:ekozhemyakin:name}
+            - ${linux:system:user:enikanorov:name}
+            - ${linux:system:user:fsoppelsa:name}
+            - ${linux:system:user:manashkin:name}
+            - ${linux:system:user:nkondra:name}
+            - ${linux:system:user:obryndzii:name}
+            - ${linux:system:user:oliemieshko:name}
+            - ${linux:system:user:sovsianikov:name}
+            # L2OPS SRE
+            - ${linux:system:user:pmichalec:name}
+            - ${linux:system:user:pmathews:name}
+            - ${linux:system:user:pcizinsky:name}
+            - ${linux:system:user:osmola:name}
+            - ${linux:system:user:cade:name}
+            - ${linux:system:user:jmosher:name}
+            - ${linux:system:user:ecantwell:name}
+            - ${linux:system:user:lmercl:name}
+        support3:
+          enabled: false
+          name: support3
+          addusers:
+            - ${linux:system:user:pmichalec:name}
+            - ${linux:system:user:pmathews:name}
+            - ${linux:system:user:pcizinsky:name}
+            - ${linux:system:user:osmola:name}
+            - ${linux:system:user:cade:name}
+            - ${linux:system:user:jmosher:name}
+            - ${linux:system:user:ecantwell:name}
+            - ${linux:system:user:lmercl:name}
+      sudo:
+        enabled: true
+        aliases:
+          command:
+            SUPPORT_SALT: ${_param:sudo_salt_safe}
+            SUPPORT_SALT_TRUSTED: ${_param:sudo_salt_trusted}
+            SUPPORT_RESTRICTED_SHELLS: ${_param:sudo_shells}
+            SUPPORT_RESTRICTED_SU: ${_param:sudo_restricted_su}
+            SUPPORT_COREUTILS: ${_param:sudo_coreutils_safe}
+            SUPPORT_RABBITMQ: ${_param:sudo_rabbitmq_safe}
+            SUPPORT_SALT_TRUSTED: ${_param:sudo_salt_trusted}
+            SUPPORT_NETWORKING: ${_param:sudo_networking}
+            SUPPORT_CONTRAIL: ${_param:sudo_contrail_utilities}
+            SUPPORT_STORAGE: ${_param:sudo_storage_utilities}
+            SUPPORT_OPENSTACK_CLIENTS: ${_param:sudo_openstack_clients}
+        groups:
+          support0:
+          # This group should have only RO access to non-sensitive data and commands
+          # assumed usage: common operations, non experienced, non technical users.
+            commands:
+                - SUPPORT_SALT
+                - '!SUPPORT_RESTRICTED_SHELLS'
+                - '!SUPPORT_RESTRICTED_SU'
+          support1:
+          # This group should have access to safe, trusted, commands
+            commands:
+                - SUPPORT_SALT
+                - SUPPORT_COREUTILS
+                - SUPPORT_RABBITMQ
+                - SUPPORT_NETWORKING
+                - SUPPORT_CONTRAIL
+                - SUPPORT_STORAGE
+                - SUPPORT_OPENSTACK_CLIENTS
+                - '!SUPPORT_RESTRICTED_SHELLS'
+                - '!SUPPORT_RESTRICTED_SU'
+          support2:
+          # This group should have access to any command using sudo
+            commands:
+                - SUPPORT_SALT
+                - SUPPORT_SALT_TRUSTED
+                - SUPPORT_COREUTILS
+                - SUPPORT_RABBITMQ
+                - SUPPORT_NETWORKING
+                - SUPPORT_CONTRAIL
+                - SUPPORT_STORAGE
+                - SUPPORT_OPENSTACK_CLIENTS
+                - '!SUPPORT_RESTRICTED_SHELLS'
+                - '!SUPPORT_RESTRICTED_SU'
+          support3:
+          # It's never safe to run unlimited number of commands with sudo.
+          # Use with caution.
+            commands:
+                - ALL
+                - '!SUPPORT_RESTRICTED_SHELLS'
+                - '!SUPPORT_RESTRICTED_SU'
diff --git a/openssh/server/team/tcpcloud.yml b/openssh/server/team/tcpcloud.yml
index 6b5205b..c7b465a 100644
--- a/openssh/server/team/tcpcloud.yml
+++ b/openssh/server/team/tcpcloud.yml
@@ -19,8 +19,11 @@
 - system.openssh.server.team.members.smatov
 - system.openssh.server.team.members.tkukral
 - system.openssh.server.team.members.vmikes
+- system.openssh.server.team.members.psvimbersky
 
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
@@ -62,4 +65,4 @@
     askotnicky:
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO6EnDYaGdF/Nn6lntxDNnKanCsheZRdh8kA/6ImyeRSjT2cgepm1Fsgv7wXBYoy0OxhB5wgCp5Az/Pj4oLkG3g+G05sUPUxxGCGRiwjcnyQ/FTz4TzHglAVqgbdgWoQYf9Hg6EKZovvPcH3STbEwcl+MhLqvxz0wm5+StE+wvp6I9dEfRV+2/e1uepauOTZ1+Ui1DMNXiMefTlbiIBHzUk7RiwJWgqzQXBndgunmbJWSed8zC0Ug97waDOFIX/oKZmAmsv0NLJ2e/kC3oUTuziGT74F9sh7Pqiw/9HZxvP45hJwEvytfUjfuiikIBbmYdF7Je93czaG/qjXGN8YvP== a.skotnicky@tcpisek.cz
     vzach:
-      key: AAAAB3NzaC1yc2EAAAABJQAAAQEAn4MJUkXbiZPPEcdKijB4MqnjPGk80x5W+8XsMvZuUqElmuLgB30kdCnSCBgipYPor3m8wakdJTTwiY6P50yhtp/tD2b4t1TC1djPwiNS/6JwjZawj30bS5ZrVKeTHtOq6E0tf927svXgEE21/ADgWpMoDeQ/pKlbt0m/U8YGBCmJ7cBa8ggGHhvJIwCNhpELn02vKV8Qfx44rk+DoxLBwQUHQ8PsEwtoSCLMIulpLflptak1pgvN6ggA5p15i36OyJkobI1yR9YEgtb+8yQqofu2DZ+v+9Qhbb+C0446RnyGzfvk/DreCeI4rJh5/6QZjwv3XfYDER5LbNCnoOQAsQ== v.zach@tcpcloud.eu
\ No newline at end of file
+      key: AAAAB3NzaC1yc2EAAAABJQAAAQEAn4MJUkXbiZPPEcdKijB4MqnjPGk80x5W+8XsMvZuUqElmuLgB30kdCnSCBgipYPor3m8wakdJTTwiY6P50yhtp/tD2b4t1TC1djPwiNS/6JwjZawj30bS5ZrVKeTHtOq6E0tf927svXgEE21/ADgWpMoDeQ/pKlbt0m/U8YGBCmJ7cBa8ggGHhvJIwCNhpELn02vKV8Qfx44rk+DoxLBwQUHQ8PsEwtoSCLMIulpLflptak1pgvN6ggA5p15i36OyJkobI1yR9YEgtb+8yQqofu2DZ+v+9Qhbb+C0446RnyGzfvk/DreCeI4rJh5/6QZjwv3XfYDER5LbNCnoOQAsQ== v.zach@tcpcloud.eu
diff --git a/prometheus/server/init.yml b/prometheus/server/init.yml
index 0ecea17..2c241bd 100644
--- a/prometheus/server/init.yml
+++ b/prometheus/server/init.yml
@@ -2,3 +2,7 @@
   _param:
     prometheus_server_config_directory: /srv/prometheus
     prometheus_server_data_directory: /data
+  prometheus:
+    server:
+      dir:
+        config_in_container: ${_param:prometheus_server_config_directory}
diff --git a/prometheus/server/target/etcd.yml b/prometheus/server/target/etcd.yml
deleted file mode 100644
index 0ac3310..0000000
--- a/prometheus/server/target/etcd.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  prometheus:
-    server:
-      target:
-        static:
-          etcd:
-            enabled: true
-            scheme: https
-            tls_config:
-              skip_verify: true
-              ssl_dir: ${_param:prometheus_server_config_directory}
-              cert_name: prometheus-server.crt
-              key_name: prometheus-server.key
diff --git a/prometheus/server/target/kubernetes/endpoint.yml b/prometheus/server/target/kubernetes/endpoint.yml
new file mode 100644
index 0000000..671f037
--- /dev/null
+++ b/prometheus/server/target/kubernetes/endpoint.yml
@@ -0,0 +1,7 @@
+parameters:
+  prometheus:
+    server:
+      target:
+        kubernetes:
+          endpoint:
+            enabled: true
diff --git a/prometheus/server/target/kubernetes.yml b/prometheus/server/target/kubernetes/init.yml
similarity index 78%
rename from prometheus/server/target/kubernetes.yml
rename to prometheus/server/target/kubernetes/init.yml
index 60ca1e0..919c916 100644
--- a/prometheus/server/target/kubernetes.yml
+++ b/prometheus/server/target/kubernetes/init.yml
@@ -5,6 +5,5 @@
         kubernetes:
           enabled: true
           api_ip: ${_param:kubernetes_control_address}
-          ssl_dir: ${_param:prometheus_server_config_directory}
           cert_name: prometheus-server.crt
           key_name: prometheus-server.key
diff --git a/prometheus/server/target/kubernetes/pod.yml b/prometheus/server/target/kubernetes/pod.yml
new file mode 100644
index 0000000..964282f
--- /dev/null
+++ b/prometheus/server/target/kubernetes/pod.yml
@@ -0,0 +1,7 @@
+parameters:
+  prometheus:
+    server:
+      target:
+        kubernetes:
+          pod:
+            enabled: true
diff --git a/reclass/storage/system/ceph_monitor_cluster.yml b/reclass/storage/system/ceph_monitor_cluster.yml
new file mode 100644
index 0000000..ca7e7ff
--- /dev/null
+++ b/reclass/storage/system/ceph_monitor_cluster.yml
@@ -0,0 +1,38 @@
+parameters:
+  _param:
+    ceph_monitor_node01_hostname: cmn01
+    ceph_monitor_node02_hostname: cmn02
+    ceph_monitor_node03_hostname: cmn03
+  reclass:
+    storage:
+      node:
+        ceph_monitor_node01:
+          name: ${_param:ceph_monitor_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.ceph.monitor
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:ceph_monitor_node01_address}
+            keepalived_vip_priority: 103
+        ceph_monitor_node02:
+          name: ${_param:ceph_monitor_node02_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.ceph.monitor
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:ceph_monitor_node02_address}
+            keepalived_vip_priority: 102
+        ceph_monitor_node03:
+          name: ${_param:ceph_monitor_node03_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.ceph.monitor
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:ceph_monitor_node03_address}
+            keepalived_vip_priority: 101
diff --git a/salt/minion/ca/octavia_ca.yml b/salt/minion/ca/octavia_ca.yml
index ac66bec..453c450 100644
--- a/salt/minion/ca/octavia_ca.yml
+++ b/salt/minion/ca/octavia_ca.yml
@@ -27,3 +27,7 @@
           days_valid:
             authority: ${_param:octavia_ca_days_valid_authority}
             certificate: ${_param:octavia_ca_days_valid_certificate}
+          ca_file: ${octavia:manager:certificates:ca_certificate}
+          ca_key_file: ${octavia:manager:certificates:ca_private_key}
+          user: octavia
+          group: octavia
diff --git a/salt/minion/cert/octavia/amphora_client.yml b/salt/minion/cert/octavia/amphora_client.yml
new file mode 100644
index 0000000..fd8f465
--- /dev/null
+++ b/salt/minion/cert/octavia/amphora_client.yml
@@ -0,0 +1,12 @@
+classes:
+- system.salt.minion.cert.octavia
+parameters:
+  salt:
+    minion:
+      cert:
+        octavia_amp_client:
+          ca_file: ${octavia:manager:certificates:ca_certificate}
+          ca_key_file: ${octavia:manager:certificates:ca_private_key}
+          key_file: ${octavia:manager:haproxy_amphora:client_cert_key}
+          cert_file: ${octavia:manager:haproxy_amphora:client_cert}
+          all_file: ${octavia:manager:haproxy_amphora:client_cert_all}
diff --git a/salt/minion/cert/octavia_amp_client.yml b/salt/minion/cert/octavia/init.yml
similarity index 60%
rename from salt/minion/cert/octavia_amp_client.yml
rename to salt/minion/cert/octavia/init.yml
index 5219450..25d3ee4 100644
--- a/salt/minion/cert/octavia_amp_client.yml
+++ b/salt/minion/cert/octavia/init.yml
@@ -12,10 +12,5 @@
           common_name: octavia_amp_client
           signing_policy: cert_open
           key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
-          ca_file: ${octavia:manager:certificates:ca_certificate}
-          ca_key_file: ${octavia:manager:certificates:ca_private_key}
-          key_file: ${octavia:manager:haproxy_amphora:client_cert_key}
-          cert_file: ${octavia:manager:haproxy_amphora:client_cert}
-          all_file: ${octavia:manager:haproxy_amphora:client_cert_all}
           user: octavia
           group: octavia
diff --git a/salt/minion/cert/prometheus_server.yml b/salt/minion/cert/prometheus_server.yml
index 30a0711..154009b 100644
--- a/salt/minion/cert/prometheus_server.yml
+++ b/salt/minion/cert/prometheus_server.yml
@@ -9,5 +9,4 @@
           cert_file: ${prometheus:server:dir:config}/prometheus-server.crt
           common_name: prometheus-server
           signing_policy: cert_client
-          alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address}
           mode: '0444'
diff --git a/sensu/server/cluster.yml b/sensu/server/cluster.yml
index 28eb78b..5c8fe85 100644
--- a/sensu/server/cluster.yml
+++ b/sensu/server/cluster.yml
@@ -11,6 +11,15 @@
     rabbitmq_cold_password: password
     rabbitmq_monitor_password: password
     sensu_message_queue_host: ${_param:cluster_vip_address}
+    cluster_redis_port: 6379
+  sensu:
+   server:
+     bind:
+       address: ${_param:single_address}
+     database:
+       engine: redis
+       host: ${_param:cluster_vip_address}
+       port: ${_param:cluster_redis_port}
   rabbitmq:
     cluster:
       name: 'monitoring'