diff --git a/.kitchen.yml b/.kitchen.yml
index 57d452e..e775ef2 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -61,7 +61,7 @@
 platforms:
   - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:
diff --git a/.travis.yml b/.travis.yml
index 00108fc..61dbf39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,18 +17,26 @@
   - bundle install
 
 env:
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
-#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
-#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
-#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
-#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
 
 before_script:
   - set -o pipefail
diff --git a/galera/meta/prometheus.yml b/galera/meta/prometheus.yml
index 6187ea1..b3a9bd3 100644
--- a/galera/meta/prometheus.yml
+++ b/galera/meta/prometheus.yml
@@ -1,31 +1,48 @@
-{% raw %}
 server:
   alert:
     GaleraServiceDown:
       if: >-
         mysql_up != 1
+  {%- raw %}
       labels:
-        severity: warning
+        severity: minor
         service: mysql
       annotations:
-        summary: 'Galera service down'
-        description: 'Galera service is down on node {{ $labels.host }}'
+        summary: "Galera service is down"
+        description: "The Galera service on the {{ $labels.host }} node is down."
+  {%- endraw %}
+    GaleraServiceOutage:
+      if: >-
+        count(label_replace(mysql_up, "cluster", "$1", "host", "([^0-9]+).+")) by (cluster) == count(label_replace(mysql_up == 0, "cluster", "$1", "host", "([^0-9]+).+")) by (cluster)
+  {%- raw %}
+      labels:
+        severity: critical
+        service: mysql
+      annotations:
+        summary: "Galera service outage"
+        description: "All Galera services within the {{ $labels.cluster }} cluster are down."
+  {% endraw %}
     GaleraNodeNotReady:
-      if: 'mysql_wsrep_ready != 1'
+      if: >-
+        mysql_wsrep_ready != 1
+  {%- raw %}
       for: 1m
       labels:
-        severity: warning
+        severity: major
         service: mysql
       annotations:
-        summary: 'Galera on {{ $labels.host }} not ready'
-        description: 'The Galera service on {{ $labels.host }} is not ready to serve queries.'
+        summary: "Galera service is not ready"
+        description: "The Galera service on the {{ $labels.host }} node is not ready to serve queries for at least 1 minute."
+  {%- endraw %}
     GaleraNodeNotConnected:
-      if: 'mysql_wsrep_connected != 1'
+      if: >-
+        mysql_wsrep_connected != 1
+  {%- raw %}
       for: 1m
       labels:
-        severity: warning
+        severity: major
         service: mysql
       annotations:
-        summary: 'Galera on {{ $labels.host }} not connected'
-        description: 'The Galera service on {{ $labels.host }} is not connected to the cluster.'
-{% endraw %}
+        summary: "Galera service is not connected"
+        description: "The Galera service on the {{ $labels.host }} node is not connected to the cluster for at least 1 minute."
+  {%- endraw %}