diff --git a/.releasenotes/notes/custom-path-proxy-7f587526696c0744.yaml b/.releasenotes/notes/custom-path-proxy-7f587526696c0744.yaml
new file mode 100644
index 0000000..6f16e07
--- /dev/null
+++ b/.releasenotes/notes/custom-path-proxy-7f587526696c0744.yaml
@@ -0,0 +1,30 @@
+---
+summary: >
+  Additional path for DevopsPortal nginx proxy service
+
+features:
+   - |
+     Possibility of defining additional path to service endpoints. Need to define 'custom_path' variable on system level metadata.
+     Result of endpoint looks like 'address:port/custom_path'. Main goal of this feature - auto loading special frame on DevopsPortal dashboard.
+
+     Example:
+     .. code-block:: yaml
+     parameters:
+       _param:
+         grafana_prometheus_ssl:
+           enabled: false
+       devops_portal:
+         config:
+           service:
+             stacklight-prometheus:
+               configure_proxy: false
+               enabled: true
+               endpoint:
+                 address: ${_param:grafana_prometheus_address}
+                 custom_path: alerts
+                 port: ${_param:grafana_prometheus_port}
+                 https: ${_param:grafana_prometheus_ssl:enabled}
+
+
+fixes:
+  - related bug: https://mirantis.jira.com/browse/PROD-15068 
diff --git a/devops_portal/service/elasticsearch.yml b/devops_portal/service/elasticsearch.yml
index 6fd9afa..ddf4a6c 100644
--- a/devops_portal/service/elasticsearch.yml
+++ b/devops_portal/service/elasticsearch.yml
@@ -5,6 +5,10 @@
         elasticsearch:
           configure_proxy: true
           resolve_hostname: true
+          proxy_connect_timeout: 300
+          proxy_send_timeout: 300
+          proxy_read_timeout: 300
+          send_timeout: 300
           endpoint:
             address: ${_param:elasticsearch_bind_host}
             port: ${_param:elasticsearch_http_bind_port}
diff --git a/devops_portal/service/grafana.yml b/devops_portal/service/grafana.yml
new file mode 100644
index 0000000..402604a
--- /dev/null
+++ b/devops_portal/service/grafana.yml
@@ -0,0 +1,14 @@
+parameters:
+  _param:
+    grafana_ssl:
+      enabled: false
+  devops_portal:
+    config:
+      service:
+        grafana:
+          configure_proxy: false
+          enabled: true
+          endpoint:
+            address: ${_param:grafana_address}
+            port: ${_param:grafana_port}
+            https: ${_param:grafana_ssl:enabled}
diff --git a/devops_portal/service/janitor_monkey.yml b/devops_portal/service/janitor_monkey.yml
index f16ae7c..8544645 100644
--- a/devops_portal/service/janitor_monkey.yml
+++ b/devops_portal/service/janitor_monkey.yml
@@ -5,6 +5,10 @@
         janitormonkey:
           configure_proxy: true
           resolve_hostname: true
+          proxy_connect_timeout: 300
+          proxy_send_timeout: 300
+          proxy_read_timeout: 300
+          send_timeout: 300
           endpoint:
             address: ${_param:janitor_monkey_bind_host}
             port: ${_param:janitor_monkey_bind_port}
diff --git a/devops_portal/service/jenkins.yml b/devops_portal/service/jenkins.yml
index 83d9d05..2a5dbc9 100644
--- a/devops_portal/service/jenkins.yml
+++ b/devops_portal/service/jenkins.yml
@@ -4,6 +4,10 @@
       service:
         jenkins:
           configure_proxy: true
+          proxy_connect_timeout: 300
+          proxy_send_timeout: 300
+          proxy_read_timeout: 300
+          send_timeout: 300
           endpoint:
             address: ${_param:haproxy_jenkins_bind_host}
             port: ${_param:haproxy_jenkins_bind_port}
diff --git a/devops_portal/service/pushkin.yml b/devops_portal/service/pushkin.yml
index 5cd172a..f2a240b 100644
--- a/devops_portal/service/pushkin.yml
+++ b/devops_portal/service/pushkin.yml
@@ -5,6 +5,10 @@
         pushkin:
           configure_proxy: true
           resolve_hostname: true
+          proxy_connect_timeout: 300
+          proxy_send_timeout: 300
+          proxy_read_timeout: 300
+          send_timeout: 300
           endpoint:
             address: ${_param:pushkin_bind_host}
             port: ${_param:pushkin_bind_port}
diff --git a/devops_portal/service/rundeck.yml b/devops_portal/service/rundeck.yml
index ad743cf..946e0c2 100644
--- a/devops_portal/service/rundeck.yml
+++ b/devops_portal/service/rundeck.yml
@@ -5,6 +5,10 @@
         rundeck:
           configure_proxy: true
           resolve_hostname: false
+          proxy_connect_timeout: 300
+          proxy_send_timeout: 300
+          proxy_read_timeout: 300
+          send_timeout: 300
           credentials:
             username: ${_param:rundeck_admin_username}
             password: ${_param:rundeck_admin_password}
diff --git a/devops_portal/service/security_monkey.yml b/devops_portal/service/security_monkey.yml
index da896a8..9fce180 100644
--- a/devops_portal/service/security_monkey.yml
+++ b/devops_portal/service/security_monkey.yml
@@ -5,6 +5,10 @@
         securitymonkey:
           configure_proxy: true
           resolve_hostname: true
+          proxy_connect_timeout: 600
+          proxy_send_timeout: 600
+          proxy_read_timeout: 600
+          send_timeout: 600
           endpoint:
             address: ${_param:security_monkey_bind_host}
             port: ${_param:security_monkey_bind_port}
diff --git a/devops_portal/service/stacklight-grafana.yml b/devops_portal/service/stacklight-grafana.yml
new file mode 100644
index 0000000..00f0990
--- /dev/null
+++ b/devops_portal/service/stacklight-grafana.yml
@@ -0,0 +1,14 @@
+parameters:
+  _param:
+    grafana_ssl:
+      enabled: false
+  devops_portal:
+    config:
+      service:
+        stacklight-grafana:
+          configure_proxy: false
+          enabled: true
+          endpoint:
+            address: ${_param:grafana_address}
+            port: ${_param:grafana_port}
+            https: ${_param:grafana_ssl:enabled}
diff --git a/devops_portal/service/stacklight-kibana.yml b/devops_portal/service/stacklight-kibana.yml
new file mode 100644
index 0000000..9fa86ae
--- /dev/null
+++ b/devops_portal/service/stacklight-kibana.yml
@@ -0,0 +1,11 @@
+parameters:
+  devops_portal:
+    config:
+      service:
+        stacklight-kibana:
+          configure_proxy: true
+          enabled: true
+          endpoint:
+            address: ${_param:haproxy_kibana_bind_host}
+            port: ${_param:haproxy_kibana_bind_port}
+            https: ${_param:haproxy_kibana_ssl:enabled}
diff --git a/devops_portal/service/stacklight-prometheus.yml b/devops_portal/service/stacklight-prometheus.yml
new file mode 100644
index 0000000..119c13f
--- /dev/null
+++ b/devops_portal/service/stacklight-prometheus.yml
@@ -0,0 +1,15 @@
+parameters:
+  _param:
+    grafana_prometheus_ssl:
+      enabled: false
+  devops_portal:
+    config:
+      service:
+        stacklight-prometheus:
+          configure_proxy: false
+          enabled: true
+          endpoint:
+            address: ${_param:grafana_prometheus_address}
+            custom_path: alerts
+            port: ${_param:stacklight_prometheus_port}
+            https: ${_param:grafana_prometheus_ssl:enabled}
diff --git a/docker/swarm/network/runbook.yml b/docker/swarm/network/runbook.yml
deleted file mode 100644
index 557b852..0000000
--- a/docker/swarm/network/runbook.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
-  _param:
-    docker_runbook_subnet: 10.40.0.0/24
-  docker:
-    client:
-      network:
-        runbook:
-          subnet: ${_param:docker_runbook_subnet}
-          driver: overlay
-          attachable: true
diff --git a/docker/swarm/service/aptly.yml b/docker/swarm/service/aptly.yml
deleted file mode 100644
index 5f6de6e..0000000
--- a/docker/swarm/service/aptly.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-parameters:
-  _param:
-    docker_image_aptly:
-      api: tcpcloud/aptly-api
-      public: tcpcloud/aptly-public
-  docker:
-    client:
-      service:
-        aptly-api:
-          environment:
-            EMAIL_ADDRESS: ${_param:admin_email}
-          restart:
-            condition: any
-          image: ${_param:docker_image_aptly:api}
-          ports:
-            - 18084:8080
-          volume:
-            site:
-              type: bind
-              source: /srv/volumes/aptly
-              destination: /var/lib/aptly
-        aptly-public:
-          replicas: 3
-          restart:
-            condition: any
-          image: ${_param:docker_image_aptly:public}
-          ports:
-            - 18085:80
-          volume:
-            site:
-              type: bind
-              source: /srv/volumes/aptly/public
-              destination: /var/www/html
diff --git a/docker/swarm/service/artifactory.yml b/docker/swarm/service/artifactory.yml
deleted file mode 100644
index 36d9577..0000000
--- a/docker/swarm/service/artifactory.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-parameters:
-  docker:
-    client:
-      service:
-        artifactory:
-          environment:
-            MYSQL_HOST: ${_param:cluster_vip_address}
-            MYSQL_USERNAME: artifactory
-            MYSQL_PASSWORD: ${_param:mysql_artifactory_password}
-            MYSQL_DATABASE: artifactory
-          restart:
-            condition: any
-          image: ${_param:docker_image_repository:cicd}/artifactory
-          ports:
-            - 18082:8081
-          volume:
-            data:
-              type: bind
-              source: /srv/volumes/artifactory/data
-              destination: /var/opt/jfrog/artifactory/data
-            backup:
-              type: bind
-              source: /srv/volumes/artifactory/backup
-              destination: /var/opt/jfrog/artifactory/backup
-            etc:
-              type: bind
-              source: /srv/volumes/artifactory/etc
-              destination: /var/opt/jfrog/artifactory/etc
-            logs:
-              type: bind
-              source: /srv/volumes/artifactory/logs
-              destination: /var/opt/jfrog/artifactory/logs
-            keys:
-              type: bind
-              source: /srv/volumes/artifactory/keys
-              destination: /var/opt/jfrog/artifactory/access/etc/keys
diff --git a/docker/swarm/service/devops_portal.yml b/docker/swarm/service/devops_portal.yml
deleted file mode 100644
index 6a82aa5..0000000
--- a/docker/swarm/service/devops_portal.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  _param:
-    docker_devops_portal_replicas: 1
-    docker_image_devops_portal: docker-sandbox.sandbox.mirantis.net/ikharin/oss/devops-portal:latest
-  docker:
-    client:
-      service:
-        devops-portal:
-          replicas: ${_param:docker_devops_portal_replicas}
-          image: ${_param:docker_image_devops_portal}
-          restart:
-            condition: any
-          ports:
-            - 18800:8000
-          volume:
-            nginx:
-              type: bind
-              source: /srv/volumes/devops_portal/nginx/
-              destination: /etc/nginx/config
-            config:
-              type: bind
-              source: /srv/volumes/devops_portal/config/
-              destination: /opt/devops-portal/config
diff --git a/docker/swarm/service/docker.yml b/docker/swarm/service/docker.yml
deleted file mode 100644
index d20b4db..0000000
--- a/docker/swarm/service/docker.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  _param:
-    docker_image_registry: registry:2
-  docker:
-    client:
-      service:
-        registry:
-          replica: 3
-          environment:
-            REGISTRY_HTTP_SECRET: ${_param:docker_registry_http_secret}
-          restart:
-            condition: any
-          image: ${_param:docker_image_registry}
-          ports:
-            - 15000:5000
-          volume:
-            site:
-              type: bind
-              source: /srv/volumes/registry
-              destination: /var/lib/registry
diff --git a/docker/swarm/service/elasticsearch.yml b/docker/swarm/service/elasticsearch.yml
deleted file mode 100644
index 4d49494..0000000
--- a/docker/swarm/service/elasticsearch.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  _param:
-    elasticsearch_replicas: 1
-    docker_image_oss_elasticsearch: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/elasticsearch:latest
-  docker:
-    client:
-      service:
-        elasticsearch:
-          replicas: ${_param:elasticsearch_replicas}
-          image: ${_param:docker_image_oss_elasticsearch}
-          restart:
-            condition: any
-          ports:
-            - ${_param:haproxy_elasticsearch_exposed_port}:${_param:haproxy_elasticsearch_bind_port}
-          volume:
-            elasticsearch:
-              type: bind
-              source: /srv/volumes/elasticsearch
-              destination: /usr/share/elasticsearch/data
diff --git a/docker/swarm/service/gerrit.yml b/docker/swarm/service/gerrit.yml
deleted file mode 100644
index 10e0629..0000000
--- a/docker/swarm/service/gerrit.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-parameters:
-  _param:
-    docker_image_gerrit: tcpcloud/gerrit:2.13.6
-    gerrit_ldap_server: ""
-    gerrit_ldap_bind_user: ""
-    gerrit_ldap_bind_password: ""
-    gerrit_ldap_account_base: ""
-    gerrit_ldap_group_base: ""
-
-  docker:
-    client:
-      service:
-        gerrit:
-          environment:
-            #GERRIT_INIT_ARGS: ""
-            DATABASE_TYPE: "mysql"
-            DB_PORT_3306_TCP_ADDR: ${_param:cluster_vip_address}
-            DB_ENV_MYSQL_USER: gerrit
-            DB_ENV_MYSQL_PASSWORD: ${_param:mysql_gerrit_password}
-            DB_ENV_MYSQL_DB: gerrit
-            AUTH_TYPE: ${_param:gerrit_auth_type}
-            LDAP_SERVER: ${_param:gerrit_ldap_server}
-            LDAP_ACCOUNTPATTERN: 'uid={username}'
-            LDAP_ACCOUNTBASE: ${_param:gerrit_ldap_account_base}
-            LDAP_GROUPBASE: ${_param:gerrit_ldap_group_base}
-            LDAP_USERNAME: ${_param:gerrit_ldap_bind_user}
-            LDAP_PASSWORD: ${_param:gerrit_ldap_bind_password}
-            WEBURL: ${_param:gerrit_public_host}
-            GERRIT_ADMIN_SSH_PUBLIC: ${_param:gerrit_admin_public_key}
-            GERRIT_ADMIN_PWD: ${_param:gerrit_admin_password}
-            GERRIT_ADMIN_EMAIL: ${_param:gerrit_admin_email}
-            CANLOADINIFRAME: "true"
-          restart:
-            condition: any
-          image: ${_param:docker_image_gerrit}
-          ports:
-            - 18083:8080
-            - 29417:29418
-          volume:
-            site:
-              type: bind
-              source: /srv/volumes/gerrit
-              destination: /var/gerrit/review_site
diff --git a/docker/swarm/service/jenkins.yml b/docker/swarm/service/jenkins.yml
deleted file mode 100644
index a39b7a4..0000000
--- a/docker/swarm/service/jenkins.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-parameters:
-  _param:
-    docker_image_jenkins: tcpcloud/jenkins:2.63
-  docker:
-    client:
-      service:
-        jenkins:
-          environment:
-            JAVA_OPTS: "-Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com"
-            JENKINS_NUM_EXECUTORS: 4
-          restart:
-            condition: any
-          image: ${_param:docker_image_jenkins}
-          ports:
-            - 18081:8080
-            - 50001:50000
-          volume:
-            home:
-              type: bind
-              source: /srv/volumes/jenkins
-              destination: /var/jenkins_home
-            cacerts:
-              type: bind
-              source: /etc/ssl/certs/java/cacerts
-              destination: /etc/ssl/certs/java/cacerts
diff --git a/docker/swarm/service/mysql.yml b/docker/swarm/service/mysql.yml
deleted file mode 100644
index f94cf4d..0000000
--- a/docker/swarm/service/mysql.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-parameters:
-  _param:
-    docker_image_mysql: mysql:5.6
-  docker:
-    client:
-      service:
-        mysql:
-          environment:
-            MYSQL_USER: gerrit
-            MYSQL_PASSWORD: ${_param:mysql_gerrit_password}
-            MYSQL_DATABASE: gerrit
-            MYSQL_ROOT_PASSWORD: ${_param:mysql_admin_password}
-          restart:
-            condition: any
-          image: "${_param:docker_image_mysql}"
-          ports:
-            - 13306:3306
-          volume:
-            data:
-              type: bind
-              source: /srv/volumes/mysql
-              destination: /var/lib/mysql
diff --git a/docker/swarm/service/openldap.yml b/docker/swarm/service/openldap.yml
deleted file mode 100644
index f7f12e2..0000000
--- a/docker/swarm/service/openldap.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-parameters:
-  _param:
-    docker_image_openldap: osixia/openldap:1.1.8
-  docker:
-    client:
-      service:
-        openldap:
-          restart:
-            condition: any
-          image: ${_param:docker_image_openldap}
-          hostname: ldap01.${_param:openldap_domain}
-          hosts:
-            ldap01:
-              name: ldap01.${_param:openldap_domain}
-              address: 127.0.0.1
-          environment:
-            HOSTNAME: ldap01.${_param:openldap_domain}
-            LDAP_ORGANISATION: "${_param:openldap_organisation}"
-            LDAP_DOMAIN: "${_param:openldap_domain}"
-            LDAP_ADMIN_PASSWORD: ${_param:openldap_admin_password}
-            LDAP_CONFIG_PASSWORD: ${_param:openldap_config_password}
-            LDAP_TLS: "false"
-          ports:
-            - 1389:389
-            - 1636:636
-          volume:
-            database:
-              type: bind
-              source: /srv/volumes/openldap/database
-              destination: /var/lib/ldap
-            config:
-              type: bind
-              source: /srv/volumes/openldap/config
-              destination: /etc/ldap/slapd.d
diff --git a/docker/swarm/service/phpldapadmin.yml b/docker/swarm/service/phpldapadmin.yml
deleted file mode 100644
index 72b109f..0000000
--- a/docker/swarm/service/phpldapadmin.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-parameters:
-  _param:
-    docker_image_phpldapadmin: tcpcloud/phpldapadmin:0.6.12
-  docker:
-    client:
-      service:
-        phpldapadmin:
-          restart:
-            condition: any
-          image: ${_param:docker_image_phpldapadmin}
-          hosts:
-            ldap:
-              name: ldap.${_param:openldap_domain}
-              address: ${_param:cluster_vip_address}
-          environment:
-            PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'${_param:cluster_public_host}': [{'server': [{'tls': False}]},{'login': [{'bind_id': 'cn=admin,${_param:openldap_dn}'},{'bind_pass': '${_param:openldap_admin_password}'}]}]}]"
-            PHPLDAPADMIN_HTTPS: false
-            PHPLDAPADMIN_TRUST_PROXY_SSL: true
-            PHPLDAPADMIN_SERVER_ADMIN: ${_param:admin_email}
-            PHPLDAPADMIN_THEME: mirantis
-          ports:
-            - 18089:80
diff --git a/docker/swarm/service/pushkin.yml b/docker/swarm/service/pushkin.yml
deleted file mode 100644
index d01842d..0000000
--- a/docker/swarm/service/pushkin.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-parameters:
-  _param:
-    docker_pushkin_replicas: 1
-    docker_image_pushkin: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/pushkin:latest
-    pushkin_db_password: pushkin
-    pushkin_db_user: pushkin
-    pushkin_db: pushkin
-  docker:
-    client:
-      service:
-        pushkin-backend:
-          environment:
-            POSTGRES_USER: ${_param:pushkin_db_user}
-            POSTGRES_PASSWORD: ${_param:pushkin_db_password}
-            POSTGRES_DB: ${_param:pushkin_db}
-            PUSHKINDBHOST: ${_param:haproxy_pushkin_db_bind_host}
-            PUSHKINELASTICHOST: ${_param:haproxy_elasticsearch_bind_host}
-          replicas: ${_param:docker_pushkin_replicas}
-          image: ${_param:docker_image_pushkin}
-          restart:
-            condition: any
-          ports:
-            - ${_param:haproxy_pushkin_exposed_port}:${_param:haproxy_pushkin_bind_port}
-          volume:
-            pushkin:
-              type: bind
-              source: /srv/volumes/pushkin/logs
-              destination: /var/log/pushkin
\ No newline at end of file
diff --git a/docker/swarm/service/pushkin_db.yml b/docker/swarm/service/pushkin_db.yml
deleted file mode 100644
index 9b81778..0000000
--- a/docker/swarm/service/pushkin_db.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-parameters:
-  _param:
-    docker_pushkin_db_replicas: 1
-    docker_image_pushkin_db: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/pushkindb:latest
-    pushkin_db_password: pushkin
-    pushkin_db_user: pushkin
-    pushkin_db: pushkin
-  docker:
-    client:
-      service:
-        pushkin-db:
-          environment:
-            POSTGRES_USER: ${_param:pushkin_db_user}
-            POSTGRES_PASSWORD: ${_param:pushkin_db_password}
-            POSTGRES_DB: ${_param:pushkin_db}
-          replicas: ${_param:docker_pushkin_db_replicas}
-          image: ${_param:docker_image_pushkin_db}
-          restart:
-            condition: any
-          ports:
-            - ${_param:haproxy_pushkin_db_exposed_port}:${_param:haproxy_pushkin_db_bind_port}
-          volume:
-            pushkin:
-              type: bind
-              source: /srv/volumes/pushkin/data
-              destination: /var/lib/postgresql/data
-
diff --git a/docker/swarm/service/rundeck.yml b/docker/swarm/service/rundeck.yml
deleted file mode 100644
index cc871dd..0000000
--- a/docker/swarm/service/rundeck.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-parameters:
-  _param:
-    docker_rundeck_replicas: 1
-    docker_image_rundeck: docker-sandbox.sandbox.mirantis.net/ikharin/oss/rundeck:devel
-  docker:
-    client:
-      service:
-        rundeck:
-          environment:
-            SERVER_URL: "http://${_param:haproxy_rundeck_bind_host}:${_param:haproxy_rundeck_bind_port}"
-            RUNDECK_ADMIN_PASSWORD: ${_param:rundeck_admin_password}
-          replicas: ${_param:docker_rundeck_replicas}
-          image: ${_param:docker_image_rundeck}
-          restart:
-            condition: any
-          ports:
-            - 14440:4440
-          volume:
-            framework.properties:
-              type: bind
-              source: /srv/volumes/rundeck/config/framework.properties
-              destination: /etc/rundeck/framework.properties
-            tokens.properties:
-              type: bind
-              source: /srv/volumes/rundeck/config/tokens.properties
-              destination: /etc/rundeck/tokens.properties
-            rundeck:
-              type: bind
-              source: /srv/volumes/rundeck/rundeck
-              destination: /var/rundeck
-            mysql:
-              type: bind
-              source: /srv/volumes/rundeck/mysql
-              destination: /var/lib/mysql
-            log:
-              type: bind
-              source: /srv/volumes/rundeck/log
-              destination: /var/log/rundeck
-            logs:
-              type: bind
-              source: /srv/volumes/rundeck/logs
-              destination: /var/lib/rundeck/logs
-            plugins:
-              type: bind
-              source: /srv/volumes/rundeck/plugins
-              destination: /opt/rundeck-plugins
-            storage:
-              type: bind
-              source: /srv/volumes/rundeck/storage
-              destination: /var/lib/rundeck/var/storage
diff --git a/docker/swarm/service/visualizer.yml b/docker/swarm/service/visualizer.yml
deleted file mode 100644
index 8519363..0000000
--- a/docker/swarm/service/visualizer.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-parameters:
-  _param:
-    docker_image_visualizer: manomarks/visualizer
-  docker:
-    client:
-      service:
-        visualizer:
-          restart:
-            condition: any
-          image: ${_param:docker_image_visualizer}
-          constraint: "node.role==manager"
-          ports:
-            - 18090:8080
-          volume:
-            docker:
-              type: bind
-              source: /var/run/docker.sock
-              destination: /var/run/docker.sock
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 5f8de05..e974dee 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -2,7 +2,7 @@
 - system.docker
 parameters:
   _param:
-    docker_image_jenkins: tcpcloud/jenkins:2.73
+    docker_image_jenkins: tcpcloud/jenkins:2.83
     jenkins_master_extra_opts: ""
     jenkins_master_executors_num: 4
     jenkins_master_max_concurent_requests: 40
diff --git a/docker/swarm/stack/pushkin.yml b/docker/swarm/stack/pushkin.yml
index 892b4f9..f7ba935 100644
--- a/docker/swarm/stack/pushkin.yml
+++ b/docker/swarm/stack/pushkin.yml
@@ -4,6 +4,7 @@
     docker_image_pushkin: docker-prod-local.artifactory.mirantis.com/mirantis/oss/pushkin
     pushkin_bind_host: pushkin-api
     pushkin_bind_port: ${_param:haproxy_pushkin_bind_port}
+    pushkin_elasticsearch: ${_param:elasticsearch_bind_host}
     pushkin_ssl:
       enabled: false
     pushkin_db: pushkin
@@ -14,7 +15,14 @@
     webhook_recipients: "recepient1@mail.com,recepient2@mail.com"
     webhook_login_id: 13
     webhook_application_id: 24
-    webhook_sfdc_username: your_sfdc_username
+    sfdc_auth_url: https://login.salesforce.com/services/oauth2/token
+    sfdc_username: user@example.net
+    sfdc_password: secret
+    sfdc_consumer_key: example_consumer_key
+    sfdc_consumer_secret: example_consumer_secret
+    sfdc_organization_id: example_organization_id
+    sfdc_sandbox_enabled: true
+    sfdc_case_fields: case_and_bool_value
   docker:
     client:
       stack:
@@ -24,7 +32,7 @@
             POSTGRES_PASSWORD: ${_param:pushkin_db_user_password}
             POSTGRES_DB: ${_param:pushkin_db}
             PUSHKINDBHOST: ${_param:postgresql_bind_host}
-            PUSHKINELASTICHOST: ${_param:elasticsearch_bind_host}
+            PUSHKINELASTICHOST: ${_param:pushkin_elasticsearch}
             WEBHOOK_FROM: ${_param:webhook_from}
             EMAIL_SENDER_PASSWORD: ${_param:pushkin_email_sender_password}
             SMTP_HOST: ${_param:pushkin_smtp_host}
@@ -32,7 +40,14 @@
             WEBHOOK_RECIPIENTS: ${_param:webhook_recipients}
             WEBHOOK_LOGIN_ID: ${_param:webhook_login_id}
             WEBHOOK_APPLICATION_ID: ${_param:webhook_application_id}
-            WEBHOOK_SFDC_USERNAME: ${_param:webhook_sfdc_username}
+            SFDC_AUTH_URL: ${_param:sfdc_auth_url}
+            SFDC_USERNAME: ${_param:sfdc_username}
+            SFDC_PASSWORD: ${_param:sfdc_password}
+            SFDC_CONSUMER_KEY: ${_param:sfdc_consumer_key}
+            SFDC_CONSUMER_SECRET: ${_param:sfdc_consumer_secret}
+            SFDC_ORGANIZATION_ID: ${_param:sfdc_organization_id}
+            SFDC_SANDBOX_ENABLED: ${_param:sfdc_sandbox_enabled}
+            SFDC_CASE_FIELDS: ${_param:sfdc_case_fields}
           service:
             pushkin-api:
               image: ${_param:docker_image_pushkin}
diff --git a/elasticsearch/client/init.yml b/elasticsearch/client/init.yml
index d0710ca..061cd6e 100644
--- a/elasticsearch/client/init.yml
+++ b/elasticsearch/client/init.yml
@@ -7,4 +7,4 @@
       enabled: true
       server:
         host: ${_param:elasticsearch_client_host}
-        port: ${_param:elasticsearch_client_port}
\ No newline at end of file
+        port: ${_param:elasticsearch_client_port}
diff --git a/elasticsearch/client/single.yml b/elasticsearch/client/single.yml
index d9ce432..41a3b57 100644
--- a/elasticsearch/client/single.yml
+++ b/elasticsearch/client/single.yml
@@ -1,8 +1,12 @@
 classes:
 - service.elasticsearch.client
 parameters:
+  _param:
+    elasticsearch_client_host: ${_param:stacklight_log_address}
+    elasticsearch_client_port: 9200
   elasticsearch:
     client:
       enabled: true
       server:
-        host: ${_param:stacklight_log_address}
+        host: ${_param:elasticsearch_client_host}
+        port: ${_param:elasticsearch_client_port}
diff --git a/elasticsearch/server/cluster.yml b/elasticsearch/server/cluster.yml
index 8f53f21..9be44ed 100644
--- a/elasticsearch/server/cluster.yml
+++ b/elasticsearch/server/cluster.yml
@@ -5,6 +5,7 @@
   _param:
     java_environment_version: "8"
     java_environment_platform: openjdk
+    elasticsearch_cluster_name: elasticsearch
   linux:
     system:
       sysctl:
@@ -15,6 +16,7 @@
       headless: true
   elasticsearch:
     server:
+      name: ${_param:elasticsearch_cluster_name}
       enabled: true
       master: true
       data: true
diff --git a/haproxy/proxy/listen/oss/elasticsearch.yml b/haproxy/proxy/listen/oss/elasticsearch.yml
index 3a4c98e..b3b7e64 100644
--- a/haproxy/proxy/listen/oss/elasticsearch.yml
+++ b/haproxy/proxy/listen/oss/elasticsearch.yml
@@ -60,4 +60,4 @@
             - name: ${_param:cluster_node03_name}
               host: ${_param:cluster_node03_address}
               port: ${_param:haproxy_elasticsearch_binary_exposed_port}
-              params: backup check
\ No newline at end of file
+              params: backup check
diff --git a/haproxy/proxy/listen/stacklight/elasticsearch.yml b/haproxy/proxy/listen/stacklight/elasticsearch.yml
index 531d647..582de6a 100644
--- a/haproxy/proxy/listen/stacklight/elasticsearch.yml
+++ b/haproxy/proxy/listen/stacklight/elasticsearch.yml
@@ -1,4 +1,10 @@
 parameters:
+  _param:
+    haproxy_elasticsearch_bind_host: ${_param:cluster_vip_address}
+    haproxy_elasticsearch_http_bind_port: 9200
+    haproxy_elasticsearch_http_exposed_port: 9200
+    haproxy_elasticsearch_binary_bind_port: 9300
+    haproxy_elasticsearch_binary_exposed_port: 9300
   haproxy:
     proxy:
       listen:
@@ -11,18 +17,40 @@
             - dontlog-normal
           balance: roundrobin
           binds:
-            - address: ${_param:cluster_vip_address}
-              port: 9200
+            - address: ${_param:haproxy_elasticsearch_bind_host}
+              port: ${_param:haproxy_elasticsearch_http_bind_port}
           servers:
             - name: ${_param:cluster_node01_hostname}
               host: ${_param:cluster_node01_address}
-              port: 9200
+              port: ${_param:haproxy_elasticsearch_http_exposed_port}
               params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
             - name: ${_param:cluster_node02_hostname}
               host: ${_param:cluster_node02_address}
-              port: 9200
+              port: ${_param:haproxy_elasticsearch_http_exposed_port}
               params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
             - name: ${_param:cluster_node03_hostname}
               host: ${_param:cluster_node03_address}
-              port: 9200
+              port: ${_param:haproxy_elasticsearch_http_exposed_port}
               params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
+        elasticsearch_binary:
+          mode: tcp
+          options:
+            - tcpka
+            - tcplog
+          balance: source
+          binds:
+            - address: ${_param:cluster_vip_address}
+              port: ${_param:haproxy_elasticsearch_binary_bind_port}
+          servers:
+            - name: ${_param:cluster_node01_hostname}
+              host: ${_param:cluster_node01_address}
+              port: ${_param:haproxy_elasticsearch_binary_exposed_port}
+              params: 'check'
+            - name: ${_param:cluster_node02_hostname}
+              host: ${_param:cluster_node02_address}
+              port: ${_param:haproxy_elasticsearch_binary_exposed_port}
+              params: 'check'
+            - name: ${_param:cluster_node03_hostname}
+              host: ${_param:cluster_node03_address}
+              port: ${_param:haproxy_elasticsearch_binary_exposed_port}
+              params: 'check'
diff --git a/haproxy/proxy/listen/stacklight/kibana.yml b/haproxy/proxy/listen/stacklight/kibana.yml
index e92e38a..e244fb1 100644
--- a/haproxy/proxy/listen/stacklight/kibana.yml
+++ b/haproxy/proxy/listen/stacklight/kibana.yml
@@ -1,4 +1,10 @@
 parameters:
+  _param:
+    haproxy_kibana_bind_host: ${_param:cluster_vip_address}
+    haproxy_kibana_bind_port: ${_param:cluster_kibana_port}
+    haproxy_kibana_exposed_port: ${_param:cluster_kibana_port}
+    haproxy_kibana_ssl:
+      enabled: false
   haproxy:
     proxy:
       listen:
@@ -10,19 +16,23 @@
             - prefer-last-server
             - dontlog-normal
           balance: roundrobin
+          http_request:
+            - action: "add-header X-Forwarded-Proto https"
+              condition: "if { ssl_fc }"
           binds:
-            - address: ${_param:cluster_vip_address}
-              port: 5601
+            - address: ${_param:haproxy_kibana_bind_host}
+              port: ${_param:haproxy_kibana_bind_port}
+              ssl: ${_param:haproxy_kibana_ssl}
           servers:
             - name: ${_param:cluster_node01_hostname}
               host: ${_param:cluster_node01_address}
-              port: 5601
+              port: ${_param:haproxy_kibana_exposed_port}
               params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
             - name: ${_param:cluster_node02_hostname}
               host: ${_param:cluster_node02_address}
-              port: 5601
+              port: ${_param:haproxy_kibana_exposed_port}
               params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
             - name: ${_param:cluster_node03_hostname}
               host: ${_param:cluster_node03_address}
-              port: 5601
+              port: ${_param:haproxy_kibana_exposed_port}
               params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 7d87ffe..5e3f4a1 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -30,6 +30,7 @@
         gerrit-trigger: {}
         git: {}
         heavy-job: {}
+        jobConfigHistory: {}
         ldap: {}
         matrix-auth: {}
         monitoring: {}
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index b6bab31..b6ed029 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -38,6 +38,10 @@
               branch: "master"
               tags: "5.6 latest"
               dockerfile: "5.6/Dockerfile"
+            - name: jnlp-slave
+              branch: "master"
+              tags: "latest"
+              dockerfile: "Dockerfile"
           template:
             discard:
               build:
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 14dd93c..7fd041e 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -38,7 +38,7 @@
               ppa: mirantis-opencontrail/opencontrail-3.1.1
               upload_source_package: true
               dpdk: contrail_dpdk_2_1
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc311
               os: ubuntu
               dist: xenial
@@ -46,7 +46,7 @@
               ppa: mirantis-opencontrail/opencontrail-3.1.1
               upload_source_package: true
               dpdk: contrail_dpdk_2_1
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc32
               os: ubuntu
               dist: trusty
@@ -70,7 +70,7 @@
               ppa: mirantis-opencontrail/opencontrail-3.2.3
               upload_source_package: true
               dpdk: contrail_dpdk_2_1
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc323
               os: ubuntu
               dist: xenial
@@ -78,7 +78,7 @@
               ppa: mirantis-opencontrail/opencontrail-3.2.3
               upload_source_package: true
               dpdk: contrail_dpdk_2_1
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc40
               os: ubuntu
               dist: trusty
@@ -86,7 +86,7 @@
               ppa: mirantis-opencontrail/opencontrail-4.0
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc40
               os: ubuntu
               dist: xenial
@@ -94,7 +94,7 @@
               ppa: mirantis-opencontrail/opencontrail-4.0
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc41
               os: ubuntu
               dist: trusty
@@ -102,7 +102,7 @@
               ppa: mirantis-opencontrail/opencontrail-4.1
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc41
               os: ubuntu
               dist: xenial
@@ -110,7 +110,7 @@
               ppa: mirantis-opencontrail/opencontrail-4.1
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc666
               os: ubuntu
               dist: trusty
@@ -118,7 +118,7 @@
               ppa: mirantis-opencontrail/opencontrail-master
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
             - buildname: oc666
               os: ubuntu
               dist: xenial
@@ -126,7 +126,7 @@
               ppa: mirantis-opencontrail/opencontrail-master
               upload_source_package: true
               dpdk: contrail_dpdk_17_02
-              build_trigger: "H H(20-23) * * *"
+              build_trigger: ""
           template:
             discard:
              build:
diff --git a/kubernetes/control/init.yml b/kubernetes/control/init.yml
index 6e5fb40..87aee26 100644
--- a/kubernetes/control/init.yml
+++ b/kubernetes/control/init.yml
@@ -1,2 +1,3 @@
 classes:
   - service.kubernetes.control.cluster
+  - system.linux.system.repo.docker_legacy
diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml
index f21f003..4164267 100644
--- a/kubernetes/master/cluster.yml
+++ b/kubernetes/master/cluster.yml
@@ -3,6 +3,7 @@
 - service.keepalived.cluster.single
 - service.haproxy.proxy.single
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.linux.system.repo.docker_legacy
 parameters:
   _param:
     kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
diff --git a/kubernetes/master/single.yml b/kubernetes/master/single.yml
index cc8d8ab..a546233 100644
--- a/kubernetes/master/single.yml
+++ b/kubernetes/master/single.yml
@@ -1,5 +1,6 @@
 classes:
 - service.kubernetes.master.single
+- system.linux.system.repo.docker_legacy
 parameters:
   _param:
     kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 0f961a3..252a0b7 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -1,6 +1,7 @@
 classes:
 - service.kubernetes.pool.cluster
 - service.docker.host
+- system.linux.system.repo.docker_legacy
 parameters:
   _param:
     # component docker images
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 00f22b8..c2505bb 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -1,6 +1,7 @@
 classes:
 - service.kubernetes.pool.single
 - service.docker.host
+- system.linux.system.repo.docker_legacy
 parameters:
   _param:
     # component docker images
diff --git a/linux/system/repo/docker_legacy.yml b/linux/system/repo/docker_legacy.yml
new file mode 100644
index 0000000..c527aa8
--- /dev/null
+++ b/linux/system/repo/docker_legacy.yml
@@ -0,0 +1,9 @@
+parameters:
+  linux:
+    system:
+      repo:
+        docker:
+          source: "deb https://apt.dockerproject.org/repo ubuntu-${_param:linux_system_codename} main"
+          architectures: amd64
+          key_id: 58118E89F3A912897C070ADBF76221572C52609D
+          key_server: keyserver.ubuntu.com
diff --git a/linux/system/repo_local/mcp/ceph.yml b/linux/system/repo_local/mcp/ceph.yml
new file mode 100644
index 0000000..89308ad
--- /dev/null
+++ b/linux/system/repo_local/mcp/ceph.yml
@@ -0,0 +1,9 @@
+parameters:
+  linux:
+    system:
+      repo:
+        ceph:
+          refresh_db: ${_param:linux_repo_refresh_db}
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} ceph"
+          architectures: amd64
+          key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/nova/compute/storage/ceph.yml b/nova/compute/storage/ceph.yml
index 7e14e1b..f9fb647 100644
--- a/nova/compute/storage/ceph.yml
+++ b/nova/compute/storage/ceph.yml
@@ -1,6 +1,9 @@
 parameters:
   _param:
-    nova_storage_client_key: nova
+    nova_storage_user: nova
+    cinder_storage_user: cinder
+    nova_storage_client_key: ${_param:nova_storage_user}
+    cinder_storage_client_key: ${_param:cinder_storage_user}
   nova:
     compute:
       ceph:
@@ -10,3 +13,5 @@
         secret_uuid: ${_param:nova_storage_secret_uuid}
         client_cinder_key: ${_param:nova_storage_client_key}
         rbd_user: ${_param:nova_storage_user}
+        cinder_secret_uuid: ${_param:cinder_storage_secret_uuid}
+        cinder_volumes_key: ${_param:cinder_storage_client_key}
diff --git a/openssh/server/team/members/cade.yml b/openssh/server/team/members/cade.yml
index 4393a67..fb22394 100644
--- a/openssh/server/team/members/cade.yml
+++ b/openssh/server/team/members/cade.yml
@@ -14,7 +14,7 @@
       enabled: true
       user:
         cade:
-          enabled: true
+          enabled: false
           public_keys:
             - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDpSYtgC/lSMXCfjjxSWFJ8WUjhGfBWLnCJ4n8AzXGw/t/x+DBjMQz40D0T4ymvn/8/vRDwZ8stISWGeTGn0G4z1H4FWM+orBbT2srPHL2/XbjKUYRQOUxp8f4wBW4VNsaTPbzjh6A1BY0d7dOee6k2N5ramIibojzbWSEkxFG9vxtXm5jDYs4gcx0rYN11+9wamsHYAdXv4VJmUMS8TEP/8p67NtRNcq1m9uuHlZE5CxTcF6CvflgnXrDrF6QrdbjPVpzXKZmvdYom0OT97FJRtcdojovsZpOo59vozmyUh2g0ycq1izpLT0uQQ3vT6mz53gc5wiUynY6yX7wedqq74/vFz/QKBYjh/OqxZMhkH4GsWXs7yGW7q4+cNEDzARyTj7ikhg/C+UrXZ5jKx7Xc7cbhyuyzHm55+AgfhPLQoiYL3trONdH539kYnY6IAAsz0213ulJRPUHN3+M0x4iEoFAqwWo3wqdkH24v8plqLga7Q3zTbLYX+FOZOv0WC9gI3elmcd9ZBHHh0SOatQEg+Eu0m3ezyLmLHQ3pidWbksz9pnkLWBxeBq3x/xSXM5geI2BgMWVV+74YhBb9+irCpaU0BPYOpX023yNskXODF5RYAt5I5fVAfogHy4S2c3xgGlYUklUEvWBtl6bFYQjQfK2xeANaFUIBKdD5hgDdhQ== cade@mirantis.com
           user: ${linux:system:user:cade}
diff --git a/openssh/server/team/members/daniillapshin.yml b/openssh/server/team/members/daniillapshin.yml
index 4d9cd34..0796ca7 100644
--- a/openssh/server/team/members/daniillapshin.yml
+++ b/openssh/server/team/members/daniillapshin.yml
@@ -14,7 +14,7 @@
       enabled: true
       user:
         dlapshin:
-          enabled: true
+          enabled: false
           public_keys: ${public_keys:dlapshin}
           user: ${linux:system:user:dlapshin}
   public_keys:
diff --git a/openssh/server/team/members/ecantwell.yml b/openssh/server/team/members/ecantwell.yml
index 9310d82..d662836 100644
--- a/openssh/server/team/members/ecantwell.yml
+++ b/openssh/server/team/members/ecantwell.yml
@@ -14,7 +14,7 @@
       enabled: true
       user:
         ecantwell:
-          enabled: true
+          enabled: false
           public_keys:
             - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYAORp6uIs68C7P2QbNh/Jd58NudtLZrCLir/iGbHx8w1kV4yHG+o1N2wS5PYTkvIAl1/bMexniQiBKSmHvT8GnLJjyNBZL9PcLvCdYQQyQsXtd9LMUAaQehwQnQhB59CDOpTyIwrUuG+z8W5DFx47wKh6yVWCAwTVDJ3bRcL4bv16TE2A3PfCUNxFy8q6Z2RbL1YdIJwsywBBTj8wT1HuEImhefRmC0PuWPzoZZdezRQs05+fgNjw3gcVh3vdzWg6Klfz2FTQl0CgXOVaFWGIE8mi+uh/g0ML5JVQNEpqGxtHtHADykZvac+ozOTthSu+JaQEgUhc8bwV/31Hzh/9r3hOlkMj/Gmsprd+JWyeKewbBKVmaCVFsN7h8WSmBoSkk4uK7yPpR3xkC+Fs5vtXGqEBYFO/44b2WNgwZNE/gEgaxQFqAvg/E2bJVLwQ8ePUxIYoZN2qv2yIvqHCmWSDs6clTz+TGPPh92Txsp2/iTodhDk1muHfS4NGf9wkSMJQPuHFR+izsC5byPYKT4QfpWOrFDa1hHEgO4Hf/zpfAS4yIeo+hNIpE740w6tZINE9RJLutiTq+datt7M9qzqMVq9xEON/I8zBmfY5Srky9gTNhSdViWVPB6Tb8xiIXHZAx4YcJ1waZNZP6Yqn0WsEkAYC3vCXqpeRNcCVu3NIkw==
           user: ${linux:system:user:ecantwell}
diff --git a/openssh/server/team/members/michaelpetersen.yml b/openssh/server/team/members/michaelpetersen.yml
index 9602569..e19ed2f 100644
--- a/openssh/server/team/members/michaelpetersen.yml
+++ b/openssh/server/team/members/michaelpetersen.yml
@@ -14,7 +14,7 @@
       enabled: true
       user:
         mpetersen:
-          enabled: true
+          enabled: false
           public_keys: ${public_keys:mpetersen}
           user: ${linux:system:user:mpetersen}
   public_keys:
diff --git a/openssh/server/team/members/mwilson.yml b/openssh/server/team/members/mwilson.yml
index 03520f4..9f2d63d 100644
--- a/openssh/server/team/members/mwilson.yml
+++ b/openssh/server/team/members/mwilson.yml
@@ -14,7 +14,7 @@
       enabled: true
       user:
         mwilson:
-          enabled: true
+          enabled: false
           public_keys:
             - key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3ltgS2MbSWR6c/V60oEHtUnLQ3bm5sSqnjFEvL00Y/aVuNL6VCnPCrWXlYSbp6P70UYuD+ngD4x7aW8jg13ii9rw2RntlaPfmttIOb6REDFohOhC4T3BPdeCd5wVe9p/ioyiFCqNi6/m/RWL7Iv8IlR/2IetQHL14VWwTgGd62sqExdb6oZM3Yux/S4jSTcMYBzt49t+QKTLiYTvQJl7Tzv8RJNzAWMsgBwo9M1N73Zqa0hA46sGkbwmWXoBhnJwowGD38q54P+WaSrar/9FT7l+uCXMwbsyYDpoRJH8SQOOpKrymEeyKCjXQUVtLopmfZMZ6COBpLsTSq1BCytwQw== /home/mwilson/.ssh/id_rsa
             - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDV6H07IEV9merlHUFV8O/Y7sczYXNZjysTBg4TkUW3mWzvW0PJMKnP6Fc1XfFE53fR71N09gkmnVlEtbHa8PTXoS89JVuUHTnitAbDdINShm0pFNWsi/3f00nbfQ8hjaxEWeZ4VlwYzP4v5IPVtpDug+epK65clIG8Xfxlp+CcckyeDdBNSztHHDuQiholzmPicN6EFM6bVUqUZSGnmxiOCrYUOMXBbYChBc3otfeF6vO3WvnKF77nixgOGGmuS0+t96vPKLB3cl5GYpTFyOmrt3tu7JPlTsqwUa0yqDa3ny+5BToIpnROhAqTZV5fV3LHgtObcWYRGANdjVWyPiNOiywiDzsw7/xzuuqV2wLeLnFG1Z+G550F1Ed4lrsPYKc7+qxZYLquI0iJoIjg5WPzNw5QBLdb1srL9zo+0A91Asx8U95IjIMWumowWjDN3Mn0qJwxW5d8SUign3wksIu2FlkLCT4u95CEIebDVEhTQQR0AOP00/KLKtBDn9a5H0UnJZZSTG4+prU3CnqyXqyp6dano86fGEkkcP2PDi/SUwoxdBvMVbdZxYpPYm+8Oe0TjLWPlwu4kYCwVnl3EYgJZAHjT6wVHOjyXcJYezPvvXY8B/VR8UfupetHg5/mVjoQQy2+Nl34AaDN2TLQLXRuG+U+hZqV5Jzc3JO+KKfDUw== mwilson@mwilson-ThinkPad-W530
diff --git a/openssh/server/team/members/pmathews.yml b/openssh/server/team/members/pmathews.yml
index a21df9f..749fed7 100644
--- a/openssh/server/team/members/pmathews.yml
+++ b/openssh/server/team/members/pmathews.yml
@@ -14,7 +14,7 @@
       enabled: true
       user:
         pmathews:
-          enabled: true
+          enabled: false
           public_keys:
             - key: ssh-rsa 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
           user: ${linux:system:user:pmathews}
diff --git a/openssh/server/team/members/scottmachtmes.yml b/openssh/server/team/members/scottmachtmes.yml
index 4e3db22..fc466fa 100644
--- a/openssh/server/team/members/scottmachtmes.yml
+++ b/openssh/server/team/members/scottmachtmes.yml
@@ -14,7 +14,7 @@
       enabled: true
       user:
         smachtmes:
-          enabled: true
+          enabled: false
           public_keys: ${public_keys:smachtmes}
           user: ${linux:system:user:smachtmes}
   public_keys:
diff --git a/openssh/server/team/members/zahedkhurasani.yml b/openssh/server/team/members/zahedkhurasani.yml
index 1b5db7b..3b6f9c8 100644
--- a/openssh/server/team/members/zahedkhurasani.yml
+++ b/openssh/server/team/members/zahedkhurasani.yml
@@ -14,7 +14,7 @@
       enabled: true
       user:
         zkhurasani:
-          enabled: true
+          enabled: false
           public_keys: ${public_keys:zkhurasani}
           user: ${linux:system:user:zkhurasani}
   public_keys:
diff --git a/openssh/server/team/stacklight.yml b/openssh/server/team/stacklight.yml
index 5e2f9d3..403e7e1 100644
--- a/openssh/server/team/stacklight.yml
+++ b/openssh/server/team/stacklight.yml
@@ -95,6 +95,13 @@
           full_name: Nikita Zaporozhets
           home: /home/nzaporozhets
           email: nzaporozhets@mirantis.com
+        sbanka:
+          enabled: true
+          name: sbanka
+          sudo: true
+          full_name: Szymon Banka
+          home: /home/sbanka
+          email: sbanka@mirantis.com
   openssh:
     client:
       enabled: true
@@ -166,6 +173,11 @@
           public_keys:
           - ${public_keys:nzaporozhets}
           user: ${linux:system:user:nzaporozhets}
+        sbanka:
+          enabled: true
+          public_keys:
+          - ${public_keys:sbanka}
+          user: ${linux:system:user:sbanka}
   public_keys:
     newt:
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3odU+3V2uDA2ptAFL9hrJRPNEEdAyztWOZFQ5Oyd9oerTGOU3p4xmrgWWjfKFKbYGhiiIUcYAol5PkTfKukGEkkjCHYA1t023soCaaAj85wCZCnw2zQNAziwxTYmAzTqgxiSvtZNMMrtJvFHRIRDzJ3M1lV0prWNWkMM1/3FAd4W49y6VT3fkMCo8uqG7CfGdgR2DgBCxf9KaNPfW5eDEPOgmE5lK8tVSEI6T+Cg7hbcTf4lFYnlFBnlQgp/0JstsM4Vbwb4B34LOpOsf2S8rrWk2xQMjwaMHXkc2s/E8iW3F5nVFuyEXYISFQIiAHw8dzC6CHgLcyHUVWwznKawZ newt@newt-dev1
@@ -193,3 +205,5 @@
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGNZxzOm7OsZi/q6Qk71fnvjCfWk4BfxpZ5hDig6N1f9D0iAMaINyNmlF2PxstSLW0Mjdq2tXTUvVWlYpGrw+YLHQmVk8dckmLdUAxe2Z0oEvtWhiQC64927ibBTgQ2Tjfkao+PFYPbdjiO4FgRymS1/FpGKhvpdyPDCcOLrxsMSK9YpPi4kbkd4GmlGMercuaEzP3JOOzJioOOLtEw3LOLWG5mAIzXjGFxuCNdTI4gqxQm/iw/tOpb9PcsY10EapZsS4Pd8j58vuhJlwdoTxI3gzySJcTlWm0tcphex0g8X0tEUI+zVjemJcrYkZgUpb6x5/mUjNxC4nv+4A4yMTP
     nzaporozhets:
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC/UtqwBD6qkEoWSrmO0jXa9sUcwumySxmkX2XCTlAj+e8tzCNndNhaUueu01pbcNrGrB7xvCHyTa5cxgJEv0RAJRxZnObTjluegiuW+/KNSGwiSDy90bwPVb6zWalrDg12xGh8C0ybmv90uC+GrGO1UXFpm5N1qL3ZsUvSjWBRZ70xXjUI4self+fWxBYJhu7hGZ0RVCeA8TjRutzdOWcSZwN2Arn2Oq+fx9n5HP8iXlPcfM6aWj+QvkXphvKjUhDYiImQ07kJctYvxEwMei5pM1dAPZefQ6FRsUP1gKYKPVp1CiBHPIKLG3LMwxp0/LWQmHB4umZvA6HYplSUXZLMd+FhCRuocVFdxe308JWeIFWyw7og/qEBlpxqW4BUk0bR3c4deI9QDKWCuuunTDB4oEB8ZnkI7utknpx7sqO72Ev2UNS/CSi3yyqgOajojQ3l+McWn9bm08KSLzuuMaexETRYQ9dgjE79N7fH+DEt5Ryii+GA2a8Gl3iRtTZs9WA94mTb/KjZBrVxh+PixpQ6s3oGFelFCPMKSPWIEb+rwuAUi0Ulrqb2UZDzJYhT50QfbCzRN2MU+8bR7PJt/xpAADvQX0iMMrMUvAVngs2YrXKapJliyHhTZxOmVdDRIyCQ1YpK2ktBJf+E+RXl3R5XUmbJkT4jZ1R6cA1QJOEKVQ== nzaporozhets@mirantis.com
+    sbanka:
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMdgjQ/jeWwQTaPyy7G5JJAkM+QPNPFkzMldPHJzOxEBzt/M5zAooj0XgbRIDIztolhXhmj8N5QSG5n3Wn9T9e2KpoxrLaVhMV5WGTgMrXMmyT8oXLV3gLxGNHMWFvplSbHLK78EsZQQ1/kBQMyPXB1+FpIuSHVOxaospOQObJ08lvQfvlO7AUUV4ecpFj3PpV5vkKPRS+KfiRm84BeGIu51BL1BClZcOyHZPBQT+DUBjm8y4Nd7pVZRjsiBzZBvUotCbn5+RqWJnu4kyoGoRNmk8pvCx7jGL1G9rE8NNsKlCUWedvyNkDeoWKvleJuzkj3ggfuCj/iTtDoXFR95e3
diff --git a/postgresql/client/sfdc.yml b/postgresql/client/sfdc.yml
new file mode 100644
index 0000000..bafd9c9
--- /dev/null
+++ b/postgresql/client/sfdc.yml
@@ -0,0 +1,30 @@
+classes:
+  - system.postgresql.client
+parameters:
+  _param:
+    sfdc_db_host: ${_param:haproxy_postgresql_bind_host}
+    sfdc_db_user: sfdc
+    sfdc_db_user_password: sfdc
+    sfdc_login_id: 14
+    sfdc_application_id: 4
+  postgresql:
+    client:
+      server:
+        server01:
+          database:
+            sfdc:
+              enabled: true
+              encoding: 'UTF8'
+              locale: 'en_US'
+              users:
+              - name: ${_param:sfdc_db_user}
+                password: ${_param:sfdc_db_user_password}
+                host: ${_param:sfdc_db_host}
+                createdb: true
+                rights: all privileges
+              init:
+                maintenance_db: pushkin
+                force: true
+                queries:
+                - INSERT INTO login VALUES (${_param:sfdc_login_id}, ${_param:sfdc_application_id}) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
+                - INSERT INTO device VALUES (${_param:sfdc_application_id}, ${_param:sfdc_login_id}, 42, 'salesforce_service', NULL, 1, NULL) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
diff --git a/reclass/storage/system/stacklightv2_server_cluster.yml b/reclass/storage/system/stacklightv2_server_cluster.yml
index 81bf22a..d150ab0 100644
--- a/reclass/storage/system/stacklightv2_server_cluster.yml
+++ b/reclass/storage/system/stacklightv2_server_cluster.yml
@@ -12,8 +12,8 @@
           domain: ${_param:cluster_domain}
           classes:
           - system.docker.swarm.master
-          - cluster.${_param:cluster_name}.stacklight.server
           - cluster.${_param:cluster_name}.stacklight.client
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: ${_param:stacklight_monitor_system_codename}