diff --git a/stable/rocketchat/Chart.yaml b/stable/rocketchat/Chart.yaml
index 93de9ca13aaf..7063c7cdfa12 100644
--- a/stable/rocketchat/Chart.yaml
+++ b/stable/rocketchat/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: rocketchat
-version: 2.0.1
+version: 2.0.2
 appVersion: 2.4.9
 description: Prepare to take off with the ultimate chat platform, experience the next level of team communications
 keywords:
diff --git a/stable/rocketchat/README.md b/stable/rocketchat/README.md
index ecf4cf5ea27b..cdc08da540b8 100644
--- a/stable/rocketchat/README.md
+++ b/stable/rocketchat/README.md
@@ -75,6 +75,18 @@ Parameter | Description | Default
 `ingress.annotations` | Annotations for the ingress | `{}`
 `ingress.path` | Path of the ingress | `/`
 `ingress.tls` | A list of [IngressTLS](https://kubernetes.io/docs/reference/federation/extensions/v1beta1/definitions/#_v1beta1_ingresstls) items | `[]`
+`livenessProbe.enabled` | Turn on and off liveness probe | `true`
+`livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | `60`
+`livenessProbe.periodSeconds` | How often to perform the probe | `15`
+`livenessProbe.timeoutSeconds` | When the probe times out | `5`
+`livenessProbe.failureThreshold` | Minimum consecutive failures for the probe | `3`
+`livenessProbe.successThreshold` | Minimum consecutive successes for the probe | `1`
+`readinessProbe.enabled` | Turn on and off readiness probe | `true`
+`readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated | `10`
+`readinessProbe.periodSeconds` | How often to perform the probe | `15`
+`readinessProbe.timeoutSeconds` | When the probe times out | `5`
+`readinessProbe.failureThreshold` | Minimum consecutive failures for the probe | `3`
+`readinessProbe.successThreshold` | Minimum consecutive successes for the probe | `1`
 `service.annotations` | Annotations for the Rocket.Chat service | `{}`
 `service.labels` | Additional labels for the Rocket.Chat service | `{}`
 `service.type` | The service type to use | `ClusterIP`
diff --git a/stable/rocketchat/templates/deployment.yaml b/stable/rocketchat/templates/deployment.yaml
index b3ca4ba21eb5..c7853514238d 100644
--- a/stable/rocketchat/templates/deployment.yaml
+++ b/stable/rocketchat/templates/deployment.yaml
@@ -78,18 +78,28 @@ spec:
         ports:
         - name: http
           containerPort: 3000
+        {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
           httpGet:
             path: /api/info
             port: http
-          initialDelaySeconds: 60
-          timeoutSeconds: 5
+          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+          successThreshold: {{ .Values.livenessProbe.successThreshold }}
+          failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+        {{- end }}
+        {{- if .Values.readinessProbe.enabled }}
         readinessProbe:
           httpGet:
             path: /api/info
             port: http
-          initialDelaySeconds: 10
-          timeoutSeconds: 5
+          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+          successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+        {{- end }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         volumeMounts:
diff --git a/stable/rocketchat/values.yaml b/stable/rocketchat/values.yaml
index 77f0b936d1c9..42faa22aeff4 100644
--- a/stable/rocketchat/values.yaml
+++ b/stable/rocketchat/values.yaml
@@ -170,3 +170,22 @@ podAnnotations: {}
   # prometheus.io/port: "9458"
   # prometheus.io/path: "/metrics"
   # prometheus.io/scrape: "true"
+
+## Liveness and readiness probe values
+## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
+##
+livenessProbe:
+  enabled: true
+  initialDelaySeconds: 60
+  periodSeconds: 15
+  timeoutSeconds: 5
+  failureThreshold: 3
+  successThreshold: 1
+
+readinessProbe:
+  enabled: true
+  initialDelaySeconds: 10
+  periodSeconds: 15
+  timeoutSeconds: 5
+  failureThreshold: 3
+  successThreshold: 1