diff --git a/README.rst b/README.rst
index 539b6d2..1f1c8f4 100644
--- a/README.rst
+++ b/README.rst
@@ -78,3 +78,19 @@
                 # Enabling 7 VFs on eth4 PF
                 echo 7 > /sys/class/net/eth4/device/sriov_numvfs; sleep 2; ip link set eth4 up
                 exit 0
+
+
+Nagios Monitoring
+=================
+
+Configure Hosts dynamically
+---------------------------
+
+The nagios formula looks up grains.items throught Salt mines to discover hosts.
+There are two different parameters that tell the nagios formula how to determine
+the hosts' IP address:
+
+- nagios_monitoring_network: IP subnet(s) in CIDR notation (can be a list)
+- nagios_monitoring_interface: interface name(s). Default ['eth0', 'ens3'].
+
+'nagios_monitoring_network' parameter takes precedence over 'nagios_monitoring_interface' list.
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 68d361e..094ae79 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -169,6 +169,8 @@
               dist: trusty
             - name: sphinx
               dist: trusty
+            - name: spinnaker
+              dist: trusty
             - name: statsd
               dist: trusty
             - name: supervisor
@@ -345,6 +347,8 @@
               dist: xenial
             - name: sphinx
               dist: xenial
+            - name: spinnaker
+              dist: xenial
             - name: statsd
               dist: xenial
             - name: supervisor
diff --git a/jenkins/client/job/gating.yml b/jenkins/client/job/gating.yml
index e825739..6b6d620 100644
--- a/jenkins/client/job/gating.yml
+++ b/jenkins/client/job/gating.yml
@@ -11,10 +11,17 @@
           name: gate-gerrit-{{name}}
           jobs:
             - name: mk
+              regex: 'mk\/.*'
             - name: debian
+              regex: 'debian\/.*'
             - name: contrail
+              regex: 'contrail\/.*'
             - name: salt-models
+              regex: 'salt-models\/.*'
             - name: salt-formulas
+              regex: 'salt-formulas\/.*'
+            - name: oss
+              regex: 'oss\/devops-portal'
           template:
             discard:
               build:
@@ -32,7 +39,7 @@
             trigger:
               gerrit:
                 project:
-                  '{{name}}\/.*':
+                  '{{regex}}':
                     compare_type: REG_EXP
                     branches:
                       - master
@@ -56,4 +63,4 @@
                 default: false
               CREDENTIALS_ID:
                 type: string
-                default: "gerrit"
\ No newline at end of file
+                default: "gerrit"
diff --git a/jenkins/client/job/git-mirrors/downstream/docker_images.yml b/jenkins/client/job/git-mirrors/downstream/docker_images.yml
new file mode 100644
index 0000000..2471280
--- /dev/null
+++ b/jenkins/client/job/git-mirrors/downstream/docker_images.yml
@@ -0,0 +1,9 @@
+classes:
+  - system.jenkins.client.job.git-mirrors.downstream
+parameters:
+  _param:
+    jenkins_git_mirror_downstream_jobs:
+      - name: docker-aptly
+        downstream: mk/docker-aptly
+        upstream: "https://github.com/tcpcloud/docker-aptly"
+        branches: master
\ No newline at end of file
diff --git a/jenkins/client/job/git-mirrors/downstream/templates.yml b/jenkins/client/job/git-mirrors/downstream/templates.yml
index 50e9152..ef504af 100644
--- a/jenkins/client/job/git-mirrors/downstream/templates.yml
+++ b/jenkins/client/job/git-mirrors/downstream/templates.yml
@@ -5,9 +5,9 @@
     jenkins_git_mirror_downstream_jobs:
       - name: cookiecutter-templates
         downstream: mk/cookiecutter-templates
-        upstream: "https://github.com/Mirantis/mk2x-cookiecutter-reclass-model"
+        upstream: "git@github.com:Mirantis/mk2x-cookiecutter-reclass-model"
         branches: master
       - name: heat-templates
         downstream: mk/heat-templates
-        upstream: "https://github.com/Mirantis/mk-lab-heat-templates"
-        branches: master
\ No newline at end of file
+        upstream: "git@github.com:Mirantis/mk-lab-heat-templates"
+        branches: master
diff --git a/jenkins/client/job/git-mirrors/upstream/docker_images.yml b/jenkins/client/job/git-mirrors/upstream/docker_images.yml
new file mode 100644
index 0000000..b4de3e2
--- /dev/null
+++ b/jenkins/client/job/git-mirrors/upstream/docker_images.yml
@@ -0,0 +1,21 @@
+classes:
+  - system.jenkins.client.job.git-mirrors.upstream
+parameters:
+  _param:
+    jenkins_git_mirror_upstream_jobs:
+      - name: docker-aptly
+        downstream: mk/docker-aptly
+        upstream: "git@github.com:tcpcloud/docker-aptly"
+        branches: master
+      - name: docker-gerrit
+        downstream: mk/docker-gerrit
+        upstream: "git@github.com:Mirantis/docker-gerrit"
+        branches: 2.12.3,2.12.6,2.12.7,2.13.6,admin,master
+      - name: docker-jenkins
+        downstream: mk/docker-jenkins
+        upstream: "git@github.com:Mirantis/docker-jenkins"
+        branches: 2.32.3,2.52,2.7.2,master
+      - name: docker-phpldapadmin
+        downstream: mk/docker-phpldapadmin
+        upstream: "git@github.com:Mirantis/docker-phpldapadmin"
+        branches: stable,master
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index e5771a2..73609c4 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -98,6 +98,7 @@
             - name: sensu
             - name: sentry
             - name: sphinx
+            - name: spinnaker
             - name: statsd
             - name: supervisor
             - name: swift
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 0dd7102..1bb0363 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -96,6 +96,7 @@
             - name: sensu
             - name: sentry
             - name: sphinx
+            - name: spinnaker
             - name: statsd
             - name: supervisor
             - name: swift
diff --git a/linux/system/repo_local/mcp/contrail.yml b/linux/system/repo_local/mcp/contrail.yml
index 158fda5..89a7236 100644
--- a/linux/system/repo_local/mcp/contrail.yml
+++ b/linux/system/repo_local/mcp/contrail.yml
@@ -6,7 +6,7 @@
   linux:
     system:
       repo:
-        mcp_opencontrail_${_param:linux_repo_contrail_component}:
+        mcp_opencontrail:
           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} ${_param:linux_repo_contrail_component}"
           architectures: amd64
diff --git a/nagios/server/init.yml b/nagios/server/init.yml
index e495915..24dea22 100644
--- a/nagios/server/init.yml
+++ b/nagios/server/init.yml
@@ -3,6 +3,10 @@
     nagios_notification_email: root@localhost
     nagios_host_dimension_key: nagios_host
     nagios_default_host_alarm_clusters: 00-clusters
+    nagios_monitoring_network: []
+    nagios_monitoring_interface:
+    - eth0
+    - ens3
   nagios :
     server:
       enabled: true
@@ -63,10 +67,8 @@
           - target: 'G@services:openssh'
             contact_groups: Operator
             use: generic_host_tpl
-            interface:
-            - eth0
-            - ens3
-            - p4p1.602
+            interface: ${_param:nagios_monitoring_interface}
+            network: ${_param:nagios_monitoring_network}
         services:
           - target: 'G@roles:openssh.server'
             name: SSH
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
new file mode 100644
index 0000000..df85109
--- /dev/null
+++ b/openssh/server/team/networking.yml
@@ -0,0 +1,93 @@
+parameters:
+  linux:
+    system:
+      user:
+        aignatov:
+          enabled: true
+          name: aignatov
+          sudo: true
+          full_name: Alexander Ignatov
+          home: /home/aignatov
+          email: aignatov@mirantis.com
+        ataraday:
+          enabled: true
+          name: ataraday
+          sudo: true
+          full_name: Anna Taraday
+          home: /home/ataraday
+          email: ataraday@mirantis.com
+        eezhova:
+          enabled: true
+          name: eezhova
+          sudo: true
+          full_name: Elena Ezhova
+          home: /home/eezhova
+          email: eezhova@mirantis.com
+        ichukhnakov:
+          enabled: true
+          name: ichukhnakov
+          sudo: true
+          full_name: Ilya Chukhnakov
+          home: /home/ichukhnakov
+          email: ichukhnakov@mirantis.com
+        ivasilevskaya:
+          enabled: true
+          name: ivasilevskaya
+          sudo: true
+          full_name: Inessa Vasilevskaya
+          home: /home/ivasilevskaya
+          email: ivasilevskaya@mirantis.com
+        obondarev:
+          enabled: true
+          name: obondarev
+          sudo: true
+          full_name: Oleg Bondarev
+          home: /home/obondarev
+          email: obondarev@mirantis.com
+  openssh:
+    server:
+      enabled: true
+      user:
+        aignatov:
+          enabled: true
+          public_keys:
+          - ${public_keys:aignatov}
+          user: ${linux:system:user:aignatov}
+        ataraday:
+          enabled: true
+          public_keys:
+          - ${public_keys:ataraday}
+          user: ${linux:system:user:ataraday}
+        eezhova:
+          enabled: true
+          public_keys:
+          - ${public_keys:eezhova}
+          user: ${linux:system:user:eezhova}
+        ichukhnakov:
+          enabled: true
+          public_keys:
+          - ${public_keys:ichukhnakov}
+          user: ${linux:system:user:ichukhnakov}
+        ivasilevskaya:
+          enabled: true
+          public_keys:
+          - ${public_keys:ivasilevskaya}
+          user: ${linux:system:user:ivasilevskaya}
+        obondarev:
+          enabled: true
+          public_keys:
+          - ${public_keys:obondarev}
+          user: ${linux:system:user:obondarev}
+  public_keys:
+    aignatov:
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJFYznIFlCdxu5UXzThjYZlZfvXKCcDN0QxDEn7U7dNkK17SyzIJswQcxF7pTlvcuZ7XEskEqyXC8E6P5XyvBJO2xLGrFDJ4U3vf7MKsfwSFEj3NPUzV5bGTrKeKIHTL94L7lwMm1INE7lZzciiwvTxcKv//A+FgG8o1MDhefK56cBH4a9TSjEd+5ImcnCc5sf8B+csyWFPnksnv1zwu//T9aYXRITocdVzrfRHmEiZDpL3mNwpGT3O3XUTiMwdVpN2ImAqSF6XlQl0HlUkBT2idCIoXUR9lcGUx2Q+LSd62JgcVmQHCOmbUENj7NIDgWixgSJYLzsi//YNqJ9jccR aignatov@mirantis.com
+    ataraday:
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9Tl4w3FVLfzTrm+P0ziWlSn74sbwycPUXY2eKdBtzLvvd8Vs7Gh8sEL9q8aeg9hY613LWjPvqgnaoosGJ52ckDnArYfpe3AG1Zamr9/Ncq7qC6U+W8lKwiuiS1QQIILm72+me7jzTanOfbpNl64+tIIcJXgPLtQK4dcpHWMXZQw8Fjp5PP7+k0P35yYNRtoHazxlE/lt/6XsQ+NnldRYB2TCtK3uU1ATHg5Sc7Qr1o+obfxDwWglasxfSd7fGqAZjszrm9q4pmKXTpKNlSqGCs7Hp4Hstr//GKLaXucyTtsb/uU40at6X3INGUU/u9txZkLwAGx8kb4XB6F5MwRH/ akamyshnikova@akamyshnikova
+    eezhova:
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9WND1z5CWjYrcUmEoao3sR29iqgw+i/osdFeYetGZYCaKSLWHXgvVLf19oYnFSNrsjAhpL6krcMc9luN4Uj1/qoigGQcLnV5KQo8AnkvdCDvBBVg/Y3fbgYmcEx6yPC3bbVB9gsfr8yvgrz3vE3gWApvf9uR2dDljL+TsdrVlWzIFVjKi6PEFErKxExYlQa+BeTmiHVjyKr1l+zNOOZN56nH33G3YYa/vxDO5ejio84LcG0Akul+MI+jZohNsvD/Y9EPm9CB6mmWeqpptVkXP+2HlfjyTG9s+KHvM/wcsW71vT+FR5N0OJAhcjYHsXSKDucD3+VzFTyFjpptRKGTJ eezhova@tiresh.local
+    ichukhnakov:
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIc4N1/KTRWKoWoM83hqRaSvk+tIX7mt8fWG4HKngB08PxXGBJElGuMvzEa3mYyKptwSYO/5wgRI/+cD+Sgbr2BGs9HJy23eYPRPwcKdcskandBjVNWrDd4op2s3wGOrwGg/P88JaGqhL8mwM/5UUK4P4gP7uoZdEK9ptHzy/OvBB0Jd6/qkzWv29k8x5ExgNehvfL8PZzcFWwajdv2y53nj1lO4Bw1i3gKVOl9DEe0JkLB8ryiJ4hIKmq7zgBcduPF8xOWUt2F7TA6/o9rXR9+NU6EnSYmOszqTHQ6P5itGogp57SGqoG1PZzXapQnZPwzDX4jMkxmdu1Ji+TJhXd
+    ivasilevskaya:
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJk2ip+Rn73D4vt47pe/Hv42ylKJv6JIzeF0k3OflH+RyliVelvo05KMcozfsmmvOKhwgDokBj3KjQ10ewDwD7Fz5H3tosa8JFOs36cuHx9aHrsEmj1oIcIyThrIBwSZGFApqJqj27sLtReVLQJPlYR59RJGw61TogkA/QooOABi+KHzuwPFjAcA1SMfFT8LwiaNPkyUdRb5EQeKCOHniRAEPGNIwskA0sxz25qbB1EU2XBFjkxRE1b5GHfUYL+c2YhAwRWTJbD2JbbcHI6HpsmJutzkS6YIkEn1CK4JuA40OQTYFSEutCk2uPPR0G+77Fec2+vD/8H+ncPxPeDqNR ina@ina-ThinkPad-X240
+    obondarev:
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDca1gqXe14l9uho3t4mZT52lXmSuUxKVOCcSO9Dy+BAmtaVK39+t7la081S5c0H+oTPIXFb32/kO37+qpEgwyOv1zimWIqcR56xrr42gW/QzVLyY64qVnQ9QFiXlvXXBW4YgBuT//SE8upOshLYnznKHOi4IkoKrAE37K34Cz/DGQzFV6sKQSmP6fjJzli0Nzu+YPdBSZW9VH1m7IKxliGoZcjdIkJ+L92+h/mPuN95Bitfe+aoexBQq3u4WjYVVsCE/9TrwLoGlr3zd7VAyVdADJf6phfIMHGDxn8W8125r9UWp4X/36yAIudVC7kHLyr0AHTfYqCVH10nEJvUwRz obondarev@Olegs-MacBook-Pro.local
diff --git a/telegraf/agent/init.yml b/telegraf/agent/init.yml
index 57a1f61..1faea32 100644
--- a/telegraf/agent/init.yml
+++ b/telegraf/agent/init.yml
@@ -1,8 +1,6 @@
 paramaters:
   telegraf:
     agent:
-      input:
-        diskio:
       output:
         prometheus_client:
           bind: