diff --git a/jenkins/client/job/deploy/lab/component/kubernetes.yml b/jenkins/client/job/deploy/lab/component/kubernetes.yml
index 5ef3bd9..e2598eb 100644
--- a/jenkins/client/job/deploy/lab/component/kubernetes.yml
+++ b/jenkins/client/job/deploy/lab/component/kubernetes.yml
@@ -33,3 +33,9 @@
         stack_install: core,k8s,contrail
         stack_test: ""
         job_timer: "H H(0-6) * * *"
+      - stack_name: k8s_ha_calico_sm
+        stack_env: devcloud
+        stack_type: heat
+        stack_install: core,k8s,calico
+        stack_test: ""
+        job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 54a13ad..4a18e8e 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -68,6 +68,10 @@
                 type: string
                 default: 'deploy-stack-cleanup'
 
+              STACK_RECLASS_BRANCH:
+                type: string
+                default: ""
+
               # salt
               SALT_MASTER_CREDENTIALS:
                 type: string
diff --git a/jenkins/client/job/deploy/update/config.yml b/jenkins/client/job/deploy/update/config.yml
index 9beabfb..e956736 100644
--- a/jenkins/client/job/deploy/update/config.yml
+++ b/jenkins/client/job/deploy/update/config.yml
@@ -42,4 +42,7 @@
             TARGET_BATCH_LIVE:
               type: string
               description: Batch size for the complete live config changes on all nodes, empty string means apply to all targetted nodes.
-
+            PULL_MODEL:
+              type: boolean
+              default: 'true'
+              description: Pull the latest reclass cluster model before applying the states.
diff --git a/jenkins/client/node.yml b/jenkins/client/node.yml
index 321951a..e5e4d3b 100644
--- a/jenkins/client/node.yml
+++ b/jenkins/client/node.yml
@@ -7,6 +7,8 @@
         master:
           node_mode: Exclusive
           remote_home: /var/lib/jenkins
+          labels:
+            - python
           launcher:
             type: master
         slave01:
diff --git a/linux/system/single.yml b/linux/system/single.yml
index d7e03e8..ccde6ad 100644
--- a/linux/system/single.yml
+++ b/linux/system/single.yml
@@ -4,8 +4,11 @@
 - system.openssh.server.single
 - system.ntp.client.single
 parameters:
+  _param:
+    local_package_repos: false
   linux:
     system:
+      local_package_repos: ${_param:local_package_repos}
       user:
         root:
           enabled: true
@@ -16,6 +19,8 @@
           version: latest
         cloud-init:
           version: purged
+        unattended-updates:
+          version: purged
         mcelog:
           version: latest
       kernel:
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
index fae16a6..1005a83 100644
--- a/openssh/server/team/support.yml
+++ b/openssh/server/team/support.yml
@@ -161,5 +161,6 @@
           support3:
           # It's never safe to run unlimited number of commands with sudo.
           # Use with caution.
+            setenv: true
             commands:
                 - ALL
diff --git a/prometheus/alertmanager/notification/email.yml b/prometheus/alertmanager/notification/email.yml
new file mode 100644
index 0000000..02b44ff
--- /dev/null
+++ b/prometheus/alertmanager/notification/email.yml
@@ -0,0 +1,23 @@
+parameters:
+  prometheus:
+    alertmanager:
+      config:
+        route:
+          routes:
+            email:
+              receiver: SMTP
+              match_re:
+                - label: route
+                  value: email
+        receiver:
+          SMTP:
+            enabled: true
+            email_configs:
+              smtp_server:
+                to: ${_param:alertmanager_notification_email_to}
+                from: ${_param:alertmanager_notification_email_from}
+                auth_username: ${_param:alertmanager_notification_email_username}
+                auth_password: ${_param:alertmanager_notification_email_password}
+                smarthost: ${_param:alertmanager_notification_email_host}
+                require_tls: ${_param:alertmanager_notification_email_require_tls}
+                send_resolved: true
diff --git a/prometheus/alertmanager/notification/slack.yml b/prometheus/alertmanager/notification/slack.yml
new file mode 100644
index 0000000..c33e013
--- /dev/null
+++ b/prometheus/alertmanager/notification/slack.yml
@@ -0,0 +1,18 @@
+parameters:
+  prometheus:
+    alertmanager:
+      config:
+        route:
+          routes:
+            slack:
+              receiver: HTTP-slack
+              match_re:
+                - label: route
+                  value: slack
+        receiver:
+          HTTP-slack:
+            enabled: true
+            slack_configs:
+              slack-endpoint:
+                api_url: "${_param:alertmanager_notification_slack_api_url}"
+                send_resolved: true