diff --git a/classes/cluster/k8s-ha-contrail-40/init.yml b/classes/cluster/k8s-ha-contrail-40/init.yml
index 26eb15a..02cb6b7 100644
--- a/classes/cluster/k8s-ha-contrail-40/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/init.yml
@@ -7,4 +7,8 @@
 
     cluster_domain: k8s-ha-contrail-40.local
     cluster_name: k8s-ha-contrail-40
-    apt_mk_version: nightly
\ No newline at end of file
+    apt_mk_version: nightly
+  openssh:
+    server:
+      alive:
+        interval: 0
\ No newline at end of file
diff --git a/classes/cluster/os-ha-contrail-ironic/init.yml b/classes/cluster/os-ha-contrail-ironic/init.yml
index 84e12ce..bd90a75 100755
--- a/classes/cluster/os-ha-contrail-ironic/init.yml
+++ b/classes/cluster/os-ha-contrail-ironic/init.yml
@@ -9,3 +9,8 @@
 - cluster.os-ha-contrail-ironic.opencontrail
 - cluster.os-ha-contrail-ironic.openstack
 - cluster.overrides
+parameters:
+  openssh:
+    server:
+      alive:
+        interval: 0
diff --git a/classes/cluster/sl-k8s-calico/stacklight/init.yml b/classes/cluster/sl-k8s-calico/stacklight/init.yml
index 3910a1a..08777c5 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/init.yml
@@ -16,6 +16,8 @@
     # Prometheus
     prometheus_control_address: ${_param:stacklight_monitor_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
+    alerta_admin_username: "admin@alerta.io"
+    alerta_admin_password: "alerta"
 
     mysql_admin_user: root
     mysql_admin_password: workshop
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/init.yml b/classes/cluster/sl-k8s-contrail/stacklight/init.yml
index c8ed2df..cb3d5bd 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/init.yml
@@ -17,7 +17,8 @@
 
     # Prometheus
     prometheus_control_address: ${_param:stacklight_monitor_address}
-
+    alerta_admin_username: "admin@alerta.io"
+    alerta_admin_password: "alerta"
     mysql_admin_user: root
     mysql_admin_password: workshop
 
diff --git a/classes/cluster/sl-os-contrail/stacklight/init.yml b/classes/cluster/sl-os-contrail/stacklight/init.yml
index 18c364e..5631501 100755
--- a/classes/cluster/sl-os-contrail/stacklight/init.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/init.yml
@@ -12,6 +12,8 @@
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
     stacklight_notification_topic: stacklight_notifications
+    alerta_admin_username: "admin@alerta.io"
+    alerta_admin_password: "alerta"
     grafana_admin_password: admin
     grafana_database_type: mysql
     grafana_database_host: ${_param:openstack_database_address}
diff --git a/classes/cluster/sl-os-ovs/stacklight/init.yml b/classes/cluster/sl-os-ovs/stacklight/init.yml
index 72a6267..9feabf7 100644
--- a/classes/cluster/sl-os-ovs/stacklight/init.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/init.yml
@@ -19,7 +19,8 @@
 
     # Prometheus
     prometheus_control_address: ${_param:stacklight_monitor_address}
-
+    alerta_admin_username: "admin@alerta.io"
+    alerta_admin_password: "alerta"
     mysql_admin_user: root
     mysql_admin_password: workshop
 
diff --git a/classes/cluster/sl-pike-dvr/.env b/classes/cluster/sl-pike-dvr/.env
index ebce5d7..8e5aad7 100644
--- a/classes/cluster/sl-pike-dvr/.env
+++ b/classes/cluster/sl-pike-dvr/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd logrotate auditd)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd logrotate auditd backupninja)
diff --git a/classes/cluster/sl-pike-dvr/stacklight/init.yml b/classes/cluster/sl-pike-dvr/stacklight/init.yml
index b5cb724..ccb613a 100644
--- a/classes/cluster/sl-pike-dvr/stacklight/init.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/init.yml
@@ -16,6 +16,8 @@
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
     stacklight_notification_topic: stacklight_notifications
+    alerta_admin_username: "admin@alerta.io"
+    alerta_admin_password: "alerta"
     grafana_admin_password: admin
     grafana_database_type: mysql
     grafana_database_host: ${_param:openstack_database_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
index 23306db..d175bd5 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
@@ -12,7 +12,8 @@
     # Prometheus
     prometheus_control_address: ${_param:stacklight_monitor_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
-
+    alerta_admin_username: "admin@alerta.io"
+    alerta_admin_password: "alerta"
     mysql_admin_user: root
     mysql_admin_password: workshop
 
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
index 6d10dd1..71ed20b 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
@@ -12,7 +12,8 @@
     # Prometheus
     prometheus_control_address: ${_param:stacklight_monitor_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
-
+    alerta_admin_username: "admin@alerta.io"
+    alerta_admin_password: "alerta"
     mysql_admin_user: root
     mysql_admin_password: workshop
 
diff --git a/classes/system b/classes/system
index 3326375..6817f76 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 3326375d2001ae71c93733a75dc4fa84e4770c55
+Subproject commit 6817f76bbdb65f7c6bc6b1555afee07530a4069c