diff --git a/components/tyk-gateway/templates/deployment-gw-repset.yaml b/components/tyk-gateway/templates/deployment-gw-repset.yaml
index d2fb7731..ad2a1677 100644
--- a/components/tyk-gateway/templates/deployment-gw-repset.yaml
+++ b/components/tyk-gateway/templates/deployment-gw-repset.yaml
@@ -427,6 +427,9 @@ spec:
           {{- include "tyk-gateway.tplvalues.render" (dict "value" .Values.gateway.extraVolumeMounts "context" $) | nindent 10 }}
           {{- end }}
         livenessProbe:
+          {{- if .Values.gateway.livenessProbe }}
+          {{- toYaml .Values.gateway.livenessProbe | nindent 10}}
+          {{- else }}
           httpGet:
             scheme: "HTTP{{ if .Values.global.tls.gateway }}S{{ end }}"
             path: /hello
@@ -439,7 +442,11 @@ spec:
           periodSeconds: 2
           timeoutSeconds: 3
           failureThreshold: 2
+          {{- end }}
         readinessProbe:
+          {{- if .Values.gateway.readinessProbe }}
+          {{- toYaml .Values.gateway.readinessProbe | nindent 10}}
+          {{- else }}
           httpGet:
             scheme: "HTTP{{ if .Values.global.tls.gateway }}S{{ end }}"
             path: /hello
@@ -452,6 +459,7 @@ spec:
           periodSeconds: 10
           timeoutSeconds: 3
           failureThreshold: 3
+          {{- end }}
       {{- with .Values.gateway.extraContainers }}
       {{- include "tyk-gateway.tplvalues.render" (dict "value" . "context" $) | nindent 6 }}
       {{- end }}
diff --git a/components/tyk-gateway/values.yaml b/components/tyk-gateway/values.yaml
index 3ee820b7..e6cf08dc 100644
--- a/components/tyk-gateway/values.yaml
+++ b/components/tyk-gateway/values.yaml
@@ -389,6 +389,33 @@ gateway:
   #  memory: 128Mi
   resources: {}
 
+  # livenessProbe values for gateway pod. All fields from PodLivenessProbe object can be added here.
+  # If set to empty or nil, the default health check on /health will be performed.
+  # livenessProbe:
+  #   httpGet:
+  #     scheme: HTTP
+  #     path: /hello
+  #     port: 8080
+  #   initialDelaySeconds: 5
+  #   periodSeconds: 2
+  #   timeoutSeconds: 3
+  #   failureThreshold: 2
+  #   successThreshold: 2
+  livenessProbe: {}
+
+  # readinessProbe values for gateway pod. All fields from PodReadinessProbe object can be added here.
+  # If set to empty or nil, the default health check on /health will be performed.
+  # readinessProbe:
+  #   httpGet:
+  #     scheme: HTTP
+  #     path: /hello
+  #     port: 8080
+  #  initialDelaySeconds: 1
+  #  periodSeconds: 10
+  #  timeoutSeconds: 3
+  #  failureThreshold: 3
+  readinessProbe: {}
+
   # securityContext values for gateway pod. All fields from PodSecurityContext object can be added here.
   securityContext:
     runAsUser: 1000
diff --git a/tyk-control-plane/values.yaml b/tyk-control-plane/values.yaml
index fd4522c5..13de56cf 100644
--- a/tyk-control-plane/values.yaml
+++ b/tyk-control-plane/values.yaml
@@ -429,6 +429,33 @@ tyk-gateway:
     #  memory: 128Mi
     resources: {}
 
+    # livenessProbe values for gateway pod. All fields from PodLivenessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # livenessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #   initialDelaySeconds: 5
+    #   periodSeconds: 2
+    #   timeoutSeconds: 3
+    #   failureThreshold: 2
+    #   successThreshold: 2
+    livenessProbe: {}
+
+    # readinessProbe values for gateway pod. All fields from PodReadinessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # readinessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #  initialDelaySeconds: 1
+    #  periodSeconds: 10
+    #  timeoutSeconds: 3
+    #  failureThreshold: 3
+    readinessProbe: {}
+
     # securityContext values for gateway pod. All fields from PodSecurityContext object can be added here.
     securityContext:
       runAsUser: 1000
diff --git a/tyk-data-plane/values.yaml b/tyk-data-plane/values.yaml
index 6831af21..1774cf93 100644
--- a/tyk-data-plane/values.yaml
+++ b/tyk-data-plane/values.yaml
@@ -372,6 +372,33 @@ tyk-gateway:
     #  memory: 128Mi
     resources: {}
 
+    # livenessProbe values for gateway pod. All fields from PodLivenessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # livenessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #   initialDelaySeconds: 5
+    #   periodSeconds: 2
+    #   timeoutSeconds: 3
+    #   failureThreshold: 2
+    #   successThreshold: 2
+    livenessProbe: {}
+
+    # readinessProbe values for gateway pod. All fields from PodReadinessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # readinessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #  initialDelaySeconds: 1
+    #  periodSeconds: 10
+    #  timeoutSeconds: 3
+    #  failureThreshold: 3
+    readinessProbe: {}
+
     # securityContext values for gateway pod. All fields from PodSecurityContext object can be added here.
     securityContext:
       runAsUser: 1000
diff --git a/tyk-oss/values.yaml b/tyk-oss/values.yaml
index b031ea00..9ac9341d 100644
--- a/tyk-oss/values.yaml
+++ b/tyk-oss/values.yaml
@@ -354,6 +354,33 @@ tyk-gateway:
     #  memory: 128Mi
     resources: {}
 
+    # livenessProbe values for gateway pod. All fields from PodLivenessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # livenessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #   initialDelaySeconds: 5
+    #   periodSeconds: 2
+    #   timeoutSeconds: 3
+    #   failureThreshold: 2
+    #   successThreshold: 2
+    livenessProbe: {}
+
+    # readinessProbe values for gateway pod. All fields from PodReadinessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # readinessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #  initialDelaySeconds: 1
+    #  periodSeconds: 10
+    #  timeoutSeconds: 3
+    #  failureThreshold: 3
+    readinessProbe: {}
+
     # securityContext values for gateway pod. All fields from PodSecurityContext object can be added here.
     securityContext:
       runAsUser: 1000
diff --git a/tyk-stack/values.yaml b/tyk-stack/values.yaml
index 6bf25282..484303db 100644
--- a/tyk-stack/values.yaml
+++ b/tyk-stack/values.yaml
@@ -445,6 +445,33 @@ tyk-gateway:
     #  memory: 128Mi
     resources: {}
 
+    # livenessProbe values for gateway pod. All fields from PodLivenessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # livenessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #   initialDelaySeconds: 5
+    #   periodSeconds: 2
+    #   timeoutSeconds: 3
+    #   failureThreshold: 2
+    #   successThreshold: 2
+    livenessProbe: {}
+
+    # readinessProbe values for gateway pod. All fields from PodReadinessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # readinessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #  initialDelaySeconds: 1
+    #  periodSeconds: 10
+    #  timeoutSeconds: 3
+    #  failureThreshold: 3
+    readinessProbe: {}
+
     # securityContext values for gateway pod. All fields from PodSecurityContext object can be added here.
     securityContext:
       runAsUser: 1000