diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index 7cc4ba2..e8ef745 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -22,69 +22,57 @@
           section: [ main , restricted, universe ]
           # Don't exclude main/x11 - its required for many pkgs.
           exclude_deb_section:
+          - Xfce
+          - comm
+          - doc
+          - electronics
           - games
           - gnome
-          - Xfce
-          - sound
-          - electronics
           - graphics
           - hamradio
-          - doc
-          - localization
           - kde
-          - video
-          - translations
+          - localization
           - news
-          - multiverse/games
-          - multiverse/gnome
-          - multiverse/Xfce
-          - multiverse/sound
-          - multiverse/electronics
-          - multiverse/graphics
-          - multiverse/hamradio
-          - multiverse/doc
-          - multiverse/localization
-          - multiverse/kde
-          - multiverse/video
-          - multiverse/translations
-          - multiverse/news
-          - multiverse/x11
-          - universe/games
-          - universe/gnome
-          - universe/Xfce
-          - universe/sound
-          - universe/electronics
-          - universe/hamradio
-          - universe/doc
-          - universe/localization
-          - universe/kde
-          - universe/video
-          - universe/translations
-          - universe/news
-          - universe/x11
-          - universe/graphics
+          - science
+          - sound
+          - translations
+          - video
+          - main/debug
+          - main/science
+          - restricted/Xfce
+          - restricted/comm
+          - restricted/debug
+          - restricted/doc
+          - restricted/electronics
           - restricted/games
           - restricted/gnome
-          - restricted/Xfce
-          - restricted/sound
-          - restricted/electronics
           - restricted/graphics
           - restricted/hamradio
-          - restricted/doc
-          - restricted/localization
           - restricted/kde
-          - restricted/video
-          - restricted/translations
+          - restricted/localization
           - restricted/news
+          - restricted/science
+          - restricted/sound
+          - restricted/translations
+          - restricted/video
           - restricted/x11
-          - main/debug
-          - multiverse/debug
-          - restricted/debug
-          - universe/debug
-          - comm
-          - multiverse/comm
+          - universe/Xfce
           - universe/comm
-          - restricted/comm
+          - universe/debug
+          - universe/doc
+          - universe/electronics
+          - universe/games
+          - universe/gnome
+          - universe/graphics
+          - universe/hamradio
+          - universe/kde
+          - universe/localization
+          - universe/news
+          - universe/science
+          - universe/sound
+          - universe/translations
+          - universe/video
+          - universe/x11
           # Updating filter, please always start from section, aka main|universe|multiverse
           filter:
             1: "--exclude='android*'"
@@ -134,15 +122,20 @@
             97: "--exclude='/universe/.*(metastudent).*'"
             # List of unused linux kernels and unsupported arch
             300: "--exclude='/.*(arm64|powerpc|s390x|armel|armhf|sparc64|mips64|ppc64el|mipsn32)(?!.*amd64)'"
-            301: "--exclude='(main|universe)/l/linux-*-(.*azure|.*aws|gke|.*azure-edge|.*oem/|.*euclid/)'"
+            301: "--exclude='(main|universe)/l/linux-*-(.*azure|.*aws|gke|gcp|.*azure-edge|.*oem/|.*euclid/)'"
             302: "--exclude='/*universe.*(-armel-|-arm-)(?!.*amd64)'"
             303: "--exclude='/main/l/linux(.*)/linux-source-*'"
-            # Generic: Old minor version of kernels. Old - if minor less then 3 digits.
-            304: '--exclude="main/l/(linux|linux-signed)/linux-.*.4\.4\.0-[0-9]{1,2}\."'
-            # Hwe 4.8: Old minor version of kernels. Old - if minor in 30-40.
-            305: '--exclude="main/l/.*hwe.*/linux-.*.4\.8\.0-((3|4)[0-9])"'
-            # Hwe 4.10: Old minor version of kernels. Old - if minor in 20-30.
-            306: '--exclude="main/l/.*hwe.*/linux-.*.4\.10\.0-((2|3)[0-9])"'
+            # Old minor version of kernel|tools|extra|cloud and related.
+            # Generic: Old - if minor less then < 127, but not 4numeric
+            304: '--exclude="main/l/linux.*/linux-.*4\.4\.0-(([0-9][0-9])|([0-9][0-2][0-6]))(\.|_|-)"'
+            # Hwe 4.8: Old - if minor in 30-49 and < 57.
+            305: '--exclude="main/l/linux.*/linux-.*4\.8\.0-(([0-4][0-9])|([0-9][0-6]))"'
+            # Hwe 4.10: Old - if minor in 0-39, < 42 .
+            306: '--exclude="main/l/linux.*/linux-.*4\.10\.0-(([0-3][0-9])|(4[0-1]))"'
+            # Hwe 4.13: Old - if minor in 0-39, < 44
+            307: '--exclude="main/l/linux.*/linux-.*4\.13\.0-(([0-3][0-9])|(4[0-4]))"'
+            # Hwe 4.15: Old - if minor in 0-19, < 24
+            308: '--exclude="main/l/linux.*/linux-.*4\.15\.0-(([0-1][0-9])|([0-2][0-3]))"'
             # List of packages, that should be fetched from fresh ppa or other mirror
             # So,removing them from upstream mirror.
             500: "--exclude='/main/m/maas/'"
diff --git a/docker/swarm/stack/monitoring/alerta.yml b/docker/swarm/stack/monitoring/alerta.yml
index 858eb38..5e99286 100644
--- a/docker/swarm/stack/monitoring/alerta.yml
+++ b/docker/swarm/stack/monitoring/alerta.yml
@@ -29,3 +29,4 @@
                 ADMIN_USERS: ${_param:alerta_admin_username}
                 ADMIN_PASSWORD: ${_param:alerta_admin_password}
                 MONGO_URI: ${_param:alerta_mongodb_uri}
+                PLUGINS: ""
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index d1dc00b..f6c19f9 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -160,7 +160,7 @@
             param:
               SALT_VERSION:
                 type: string
-                default: ""
+                default: "2017.7"
                 description: "Version of salt for use in test, empty string means latest (default)"
               SALT_OPTS:
                 type: string
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 207296b..d1638a6 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -246,7 +246,7 @@
               description: Docker image to use for running Rally/Tempest
             TARGET_NODE:
               type: string
-              default: "${_param:cicd_control_node03_hostname}.${_param:cluster_domain}"
+              default: ""
               description: Node where container with Tempest will be run
             PROXY:
               type: string
@@ -301,7 +301,7 @@
               description: Credentials to the Salt API
             TEMPEST_TARGET_NODE:
               type: string
-              default: "${_param:cicd_control_node03_hostname}.${_param:cluster_domain}"
+              default: ""
               description: Node where container with tempest will be run
             TEST_IMAGE:
               type: string
@@ -381,7 +381,7 @@
               description: Credentials to the Salt API
             TARGET_NODE:
               type: string
-              default: "${_param:cicd_control_node03_hostname}.${_param:cluster_domain}"
+              default: ""
               description: Node where docker container with Rally will be run
             TOOLS_REPO:
               type: string
diff --git a/prometheus/server/alert/alerta_relabel.yml b/prometheus/server/alert/alerta_relabel.yml
index ca0f4b4..df6aca0 100644
--- a/prometheus/server/alert/alerta_relabel.yml
+++ b/prometheus/server/alert/alerta_relabel.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    alerta_environment_label: Development
+    alerta_environment_label: ${_param:cluster_name}
   prometheus:
     server:
       config:
@@ -22,4 +22,4 @@
             regex: "(.+;.+)"
           - source_labels: ["hostname", "job"]
             target_label: "instance"
-            regex: "(.+;.+)"
\ No newline at end of file
+            regex: "(.+;.+)"