diff --git a/galera/master.sls b/galera/master.sls
index efde836..6d230b4 100644
--- a/galera/master.sls
+++ b/galera/master.sls
@@ -45,12 +45,25 @@
   - require:
     - pkg: galera_packages
 
+{%- if grains.get('init', None) == "upstart" %}
+
 galera_purge_init:
   file.absent:
-  - name: /etc/init/mysql.conf
-  - require: 
+  - name: /etc/init.d/mysql
+  - require:
     - pkg: galera_packages
 
+galera_overide:
+  file.managed:
+  - name: /etc/init/mysql.override
+  - contents: |
+      limit nofile 102400 102400
+      exec /usr/bin/mysqld_safe
+  - require:
+    - pkg: galera_packages
+
+{%- endif %}
+
 galera_conf_debian:
   file.managed:
   - name: /etc/mysql/debian.cnf
diff --git a/galera/meta/heka.yml b/galera/meta/heka.yml
index 7694e12..eee3fa5 100644
--- a/galera/meta/heka.yml
+++ b/galera/meta/heka.yml
@@ -32,7 +32,7 @@
         function: last
     mysql_node_connected:
       description: 'The MySQL service has lost connectivity with the other nodes'
-      severity: critical
+      severity: down
       rules:
       - metric: mysql_cluster_connected
         relational_operator: '=='
@@ -42,7 +42,7 @@
         function: min
     mysql_node_ready:
       description: "The MySQL service isn't ready to serve queries"
-      severity: critical
+      severity: down
       rules:
       - metric: mysql_cluster_ready
         relational_operator: '=='
@@ -56,25 +56,46 @@
       triggers:
       - mysql_check
       dimension:
-        service: mysql
+        service: mysql-check
     mysql_node_status:
       alerting: enabled
       triggers:
       - mysql_node_connected
       - mysql_node_ready
       dimension:
-        service: mysql
+        service: mysql-node-status
 aggregator:
   alarm_cluster:
-    mysql:
-      policy: majority_of_members
-      alerting: enabled_with_notification
+    mysql_check:
+      policy: availability_of_members
+      alerting: enabled
       match:
-        service: mysql
+        service: mysql-check
       group_by: hostname
       members:
       - mysql_check
+      dimension:
+        service: mysql
+        nagios_host: 01-service-clusters
+    mysql_status:
+      policy: availability_of_members
+      alerting: enabled
+      match:
+        service: mysql-node-status
+      group_by: hostname
+      members:
       - mysql_node_status
       dimension:
+        service: mysql
+        nagios_host: 01-service-clusters
+    mysql:
+      policy: highest_severity
+      alerting: enabled_with_notification
+      match:
+        service: mysql
+      members:
+      - mysql_check
+      - mysql_status
+      dimension:
         cluster_name: mysql
         nagios_host: 00-top-clusters
diff --git a/galera/slave.sls b/galera/slave.sls
index 5a58186..fb59f48 100644
--- a/galera/slave.sls
+++ b/galera/slave.sls
@@ -45,12 +45,25 @@
   - require:
     - pkg: galera_packages
 
+{%- if grains.get('init', None) == "upstart" %}
+
 galera_purge_init:
   file.absent:
-  - name: /etc/init/mysql.conf
+  - name: /etc/init.d/mysql
   - require:
     - pkg: galera_packages
 
+galera_overide:
+  file.managed:
+  - name: /etc/init/mysql.override
+  - contents: |
+      limit nofile 102400 102400
+      exec /usr/bin/mysqld_safe
+  - require:
+    - pkg: galera_packages
+
+{%- endif %}
+
 galera_conf_debian:
   file.managed:
   - name: /etc/mysql/debian.cnf