diff --git a/stable/prometheus-rabbitmq-exporter/Chart.yaml b/stable/prometheus-rabbitmq-exporter/Chart.yaml
index 60007071d4..d64cbcf383 100644
--- a/stable/prometheus-rabbitmq-exporter/Chart.yaml
+++ b/stable/prometheus-rabbitmq-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Rabbitmq metrics exporter for prometheus
 name: prometheus-rabbitmq-exporter
-version: 0.5.3
+version: 0.5.5
 appVersion: v0.29.0
 home: https://github.com/kbudde/rabbitmq_exporter
 sources:
diff --git a/stable/prometheus-rabbitmq-exporter/templates/prometheusrule.yaml b/stable/prometheus-rabbitmq-exporter/templates/prometheusrule.yaml
new file mode 100644
index 0000000000..1f9b3f44c5
--- /dev/null
+++ b/stable/prometheus-rabbitmq-exporter/templates/prometheusrule.yaml
@@ -0,0 +1,47 @@
+{{- if .Values.prometheus.rules.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ template "prometheus-rabbitmq-exporter.fullname" . }}
+  labels:
+    app: {{ template "prometheus-rabbitmq-exporter.name" . }}
+    chart: {{ template "prometheus-rabbitmq-exporter.chart" . }}
+    heritage: {{ .Release.Service }}
+  {{- if .Values.prometheus.rules.additionalLabels }}
+{{ toYaml .Values.prometheus.rules.additionalLabels | indent 4 }}
+  {{- end }}
+spec:
+  groups:
+  - name: rabbitmq
+    rules:
+    - alert: RabbitmqDown
+      expr: |
+        absent(rabbitmq_up == 1)
+      for: 1m
+      labels:
+        severity: critical
+    - alert: RabbitmqNotRunning
+      expr: |
+        rabbitmq_running{self="1"} != 1
+      for: 1m
+      labels:
+        severity: critical
+    - alert: RabbitmqMessages
+      expr: |
+        rabbitmq_queue_messages > 250
+      for: 10m
+      labels:
+        severity: warning
+    - alert: RabbitmqMessages
+      expr: |
+        rabbitmq_queue_messages > 500
+      for: 10m
+      labels:
+        severity: critical
+    - alert: RabbitmqPartition
+      expr: |
+        rabbitmq_partitions{self="1"} != 0
+      for: 1m
+      labels:
+        severity: critical
+{{- end }}
\ No newline at end of file
diff --git a/stable/prometheus-rabbitmq-exporter/templates/service.yaml b/stable/prometheus-rabbitmq-exporter/templates/service.yaml
index af367c41bd..98da08487c 100644
--- a/stable/prometheus-rabbitmq-exporter/templates/service.yaml
+++ b/stable/prometheus-rabbitmq-exporter/templates/service.yaml
@@ -13,7 +13,7 @@ spec:
     - port: {{ .Values.service.externalPort }}
       targetPort: publish
       protocol: TCP
-      name: publish
+      name: rabbitmq-exporter
   selector:
     app: {{ template "prometheus-rabbitmq-exporter.name" . }}
     release: {{ .Release.Name }}
diff --git a/stable/prometheus-rabbitmq-exporter/values.yaml b/stable/prometheus-rabbitmq-exporter/values.yaml
index f68e5f7e2a..33ea475d79 100644
--- a/stable/prometheus-rabbitmq-exporter/values.yaml
+++ b/stable/prometheus-rabbitmq-exporter/values.yaml
@@ -57,3 +57,6 @@ prometheus:
     additionalLabels: {}
     interval: 15s
     namespace: []
+  rules:
+    enabled: false
+    additionalLabels: {}