diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml
index 8ccac65ded..a2fab51bf2 100644
--- a/stable/rabbitmq/Chart.yaml
+++ b/stable/rabbitmq/Chart.yaml
@@ -1,5 +1,5 @@
 name: rabbitmq
-version: 0.5.2
+version: 0.5.3
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
 - rabbitmq
diff --git a/stable/rabbitmq/templates/deployment.yaml b/stable/rabbitmq/templates/deployment.yaml
index 8a26147f94..4e62bb739f 100644
--- a/stable/rabbitmq/templates/deployment.yaml
+++ b/stable/rabbitmq/templates/deployment.yaml
@@ -56,15 +56,17 @@ spec:
             command:
             - rabbitmqctl
             - status
-          initialDelaySeconds: 30
+          initialDelaySeconds: 120
           timeoutSeconds: 5
+          failureThreshold: 6
         readinessProbe:
           exec:
             command:
             - rabbitmqctl
             - status
-          initialDelaySeconds: 5
-          timeoutSeconds: 1
+          initialDelaySeconds: 10
+          timeoutSeconds: 3
+          periodSeconds: 5
         volumeMounts:
         - name: data
           mountPath: /bitnami/rabbitmq
@@ -74,7 +76,7 @@ spec:
       - name: data
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ .Values.persistence.existingClaim | default (include "fullname" .) }} 
+          claimName: {{ .Values.persistence.existingClaim | default (include "fullname" .) }}
       {{- else }}
         emptyDir: {}
       {{- end -}}
diff --git a/stable/rabbitmq/values.yaml b/stable/rabbitmq/values.yaml
index 11da735e77..b91563004b 100644
--- a/stable/rabbitmq/values.yaml
+++ b/stable/rabbitmq/values.yaml
@@ -1,7 +1,7 @@
 ## Bitnami RabbitMQ image version
 ## ref: https://hub.docker.com/r/bitnami/rabbitmq/tags/
 ##
-image: bitnami/rabbitmq:3.6.9-r1
+image: bitnami/rabbitmq:3.6.10-r0
 
 ## Specify a imagePullPolicy
 ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'