diff --git a/components/tyk-pump/templates/deployment-pmp.yaml b/components/tyk-pump/templates/deployment-pmp.yaml
index e8e3c3d8..5e4eda71 100644
--- a/components/tyk-pump/templates/deployment-pmp.yaml
+++ b/components/tyk-pump/templates/deployment-pmp.yaml
@@ -64,8 +64,8 @@ spec:
         livenessProbe:
           httpGet:
             scheme: "HTTP"
-            path: /{{ .Values.pump.service.healthEndpointName | default "health" }}
-            port: {{ .Values.pump.service.healthEndpointPort | default 8083 }}
+            path: /{{ .Values.pump.healthCheckService.path }}
+            port: {{ .Values.pump.healthCheckService.port }}
         {{- toYaml .Values.pump.livenessProbe | nindent 10 }}
         {{- end }}
 
@@ -73,8 +73,8 @@ spec:
         readinessProbe:
           httpGet:
             scheme: "HTTP"
-            path: /{{ .Values.pump.service.healthEndpointName | default "health" }}
-            port: {{ .Values.pump.service.healthEndpointPort | default 8083 }}
+            path: /{{ .Values.pump.healthCheckService.path }}
+            port: {{ .Values.pump.healthCheckService.port }}
         {{- toYaml .Values.pump.readinessProbe | nindent 10 }}
         {{- end }}        
                
@@ -356,14 +356,12 @@ spec:
             value: "4000"
           - name: TYK_PMP_PURGEDELAY
             value: "2"
-        {{- if .Values.pump.service.healthEnabled }}
+        {{- if .Values.pump.healthCheckService.enabled }}
           - name: TYK_PMP_HEALTHCHECKENDPOINTNAME
-            value: "{{ .Values.pump.service.healthEndpointName }}"
-        {{- end }}
-        {{- if .Values.pump.service.healthEnabled}}
+            value: "{{ .Values.pump.healthCheckService.path }}"
           - name: TYK_PMP_HEALTHCHECKENDPOINTPORT
-            value: "{{ .Values.pump.service.healthEndpointPort }}"
-        {{- end }}                    
+            value: "{{ .Values.pump.healthCheckService.port }}"
+        {{- end }}              
 
         {{- if .Values.pump.extraEnvs }}
         {{- include "tyk-pump.tplvalues.render" ( dict "value" .Values.pump.extraEnvs "context" $ ) | nindent 10 }}
diff --git a/components/tyk-pump/templates/service-pump-health.yaml b/components/tyk-pump/templates/service-pump-health.yaml
index eac42f21..52b2464f 100644
--- a/components/tyk-pump/templates/service-pump-health.yaml
+++ b/components/tyk-pump/templates/service-pump-health.yaml
@@ -1,10 +1,10 @@
-{{- if .Values.pump.service.healthEnabled -}}
+{{- if .Values.pump.healthCheckService.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
   name: pump-svc-health-{{ include "tyk-pump.fullname" . }}
-  {{- if .Values.pump.service.annotations }}
-  {{ toYaml .Values.pump.service.annotations }}
+  {{- if .Values.pump.healthCheckService.annotations }}
+  {{ toYaml .Values.pump.healthCheckService.annotations }}
   {{- end }}
   labels:
     app: pump-svc-{{ include "tyk-pump.fullname" . }}
@@ -13,13 +13,13 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   ports:   
-    - port: {{ .Values.pump.service.healthEndpointPort | default 8083 }}
-      targetPort: {{ .Values.pump.service.healthEndpointPort | default 8083 }} 
+    - port: {{ .Values.pump.healthCheckService.port }}
+      targetPort: {{ .Values.pump.healthCheckService.port }} 
       protocol: TCP
-      name: {{ default "http" .Values.pump.service.portName | quote }}
-  type: {{ .Values.pump.service.type }}
+      name: {{ default "http" .Values.pump.healthCheckService.portName | quote }}
+  type: {{ .Values.pump.healthCheckService.type }}
   {{- if eq .Values.pump.service.type "LoadBalancer" }}
-  externalTrafficPolicy: {{ .Values.pump.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.pump.healthCheckService.externalTrafficPolicy }}
   {{- end }}
   selector:
     app: pump-{{ include "tyk-pump.fullname" . }}
diff --git a/components/tyk-pump/values.yaml b/components/tyk-pump/values.yaml
index a616de67..8c58ff53 100644
--- a/components/tyk-pump/values.yaml
+++ b/components/tyk-pump/values.yaml
@@ -206,17 +206,6 @@ pump:
     # Tyk Pump svc is disabled by default. Set it to true to enable it.
     enabled: false
 
-    # healthEnabled enables health check service
-    healthEnabled: false
-
-    # healthEndpointName sets the health check path. 
-    # It defaults to hello if health check is enabled and it is not set.
-    healthEndpointName: ""
-
-    # healthEndpointPort sets the health check port. 
-    # It defaults to 8083 if health check is enabled and it is not set.
-    healthEndpointPort:
-
     # type specifies type of the service.
     type: ClusterIP
 
@@ -231,7 +220,32 @@ pump:
     annotations: {}
 
     # The name for the service port
-    portName: ""    
+    portName: ""
+
+  healthCheckService:
+    # type specifies type of the service.
+    type: ClusterIP
+
+    # Tyk Pump health service is disabled by default. 
+    # Set it to true to enable it.
+    enabled: false
+
+    # path sets the health check path.
+    path: ""
+
+    # port sets the health check port. 
+    # It defaults to 8083 if health check is enabled and it is not set.
+    port: 8083
+
+    # The name for the health check service port
+    portName: ""
+
+    # annotations specifies annotations to be added Tyk Pump service.
+    annotations: {}
+
+    # externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or
+    # cluster-wide endpoints, while using LoadBalancer type of service.
+    externalTrafficPolicy: Local       
 
   # containerPort represents the port where Tyk Pump serve the metrics, for instance metrics for Prometheus.
   # The default port is 9090.
diff --git a/tyk-control-plane/values.yaml b/tyk-control-plane/values.yaml
index a52cca1c..e5783951 100644
--- a/tyk-control-plane/values.yaml
+++ b/tyk-control-plane/values.yaml
@@ -736,17 +736,6 @@ tyk-pump:
       # Tyk Pump svc is disabled by default. Set it to true to enable it.
       enabled: false
 
-      # healthEnabled enables health check service
-      healthEnabled: false
-
-      # healthEndpointName sets the health check path.
-      # It defaults to hello if health check is enabled and it is not set.
-      healthEndpointName: ""
-
-      # healthEndpointPort sets the health check port.
-      # It defaults to 8083 if health check is enabled and it is not set.
-      healthEndpointPort:
-
       # type specifies type of the service.
       type: ClusterIP
 
@@ -760,6 +749,31 @@ tyk-pump:
       # annotations specifies annotations to be added Tyk Pump service.
       annotations: {}
 
+    healthCheckService:
+      # type specifies type of the service.
+      type: ClusterIP
+
+      # Tyk Pump health service is disabled by default.
+      # Set it to true to enable it.
+      enabled: false
+
+      # path sets the health check path.
+      path: ""
+
+      # port sets the health check port.
+      # It defaults to 8083 if health check is enabled and it is not set.
+      port: 8083
+
+      # The name for the health check service port
+      portName: ""
+
+      # annotations specifies annotations to be added Tyk Pump service.
+      annotations: {}
+
+      # externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or
+      # cluster-wide endpoints, while using LoadBalancer type of service.
+      externalTrafficPolicy: Local
+
     # containerPort represents the port where Tyk Pump serve the metrics, for instance metrics for Prometheus.
     # The default port is 9090.
     containerPort: 9090
diff --git a/tyk-data-plane/values.yaml b/tyk-data-plane/values.yaml
index 67a23421..0f450771 100644
--- a/tyk-data-plane/values.yaml
+++ b/tyk-data-plane/values.yaml
@@ -618,17 +618,6 @@ tyk-pump:
       # Tyk Pump svc is disabled by default. Set it to true to enable it.
       enabled: false
 
-      # healthEnabled enables health check service
-      healthEnabled: false
-
-      # healthEndpointName sets the health check path.
-      # It defaults to hello if health check is enabled and it is not set.
-      healthEndpointName: ""
-
-      # healthEndpointPort sets the health check port.
-      # It defaults to 8083 if health check is enabled and it is not set.
-      healthEndpointPort:
-
       # type specifies type of the service.
       type: ClusterIP
 
@@ -642,6 +631,31 @@ tyk-pump:
       # annotations specifies annotations to be added Tyk Pump service.
       annotations: {}
 
+    healthCheckService:
+      # type specifies type of the service.
+      type: ClusterIP
+
+      # Tyk Pump health service is disabled by default.
+      # Set it to true to enable it.
+      enabled: false
+
+      # path sets the health check path.
+      path: ""
+
+      # port sets the health check port.
+      # It defaults to 8083 if health check is enabled and it is not set.
+      port: 8083
+
+      # The name for the health check service port
+      portName: ""
+
+      # annotations specifies annotations to be added Tyk Pump service.
+      annotations: {}
+
+      # externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or
+      # cluster-wide endpoints, while using LoadBalancer type of service.
+      externalTrafficPolicy: Local
+
     # containerPort represents the port where Tyk Pump serve the metrics, for instance metrics for Prometheus.
     # The default port is 9090.
     containerPort: 9090
diff --git a/tyk-oss/values.yaml b/tyk-oss/values.yaml
index 1c7f7809..ae7c71f8 100644
--- a/tyk-oss/values.yaml
+++ b/tyk-oss/values.yaml
@@ -659,17 +659,6 @@ tyk-pump:
       # Tyk Pump svc is disabled by default. Set it to true to enable it.
       enabled: false
 
-      # healthEnabled enables health check service
-      healthEnabled: false
-
-      # healthEndpointName sets the health check path.
-      # It defaults to hello if health check is enabled and it is not set.
-      healthEndpointName: ""
-
-      # healthEndpointPort sets the health check port.
-      # It defaults to 8083 if health check is enabled and it is not set.
-      healthEndpointPort:
-
       # type specifies type of the service.
       type: ClusterIP
 
@@ -683,6 +672,31 @@ tyk-pump:
       # annotations specifies annotations to be added Tyk Pump service.
       annotations: {}
 
+    healthCheckService:
+      # type specifies type of the service.
+      type: ClusterIP
+
+      # Tyk Pump health service is disabled by default.
+      # Set it to true to enable it.
+      enabled: false
+
+      # path sets the health check path.
+      path: ""
+
+      # port sets the health check port.
+      # It defaults to 8083 if health check is enabled and it is not set.
+      port: 8083
+
+      # The name for the health check service port
+      portName: ""
+
+      # annotations specifies annotations to be added Tyk Pump service.
+      annotations: {}
+
+      # externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or
+      # cluster-wide endpoints, while using LoadBalancer type of service.
+      externalTrafficPolicy: Local
+
     # containerPort represents the port where Tyk Pump serve the metrics, for instance metrics for Prometheus.
     # The default port is 9090.
     containerPort: 9090
@@ -826,7 +840,7 @@ tyk-pump:
     #   periodSeconds: 10
     #   timeoutSeconds: 3
     #   failureThreshold: 3
-    readinessProbe: {}    
+    readinessProbe: {}
 
 tests:
   enabled: true
diff --git a/tyk-stack/values.yaml b/tyk-stack/values.yaml
index bdd5899e..a41c7dcf 100644
--- a/tyk-stack/values.yaml
+++ b/tyk-stack/values.yaml
@@ -754,17 +754,6 @@ tyk-pump:
       # Tyk Pump svc is disabled by default. Set it to true to enable it.
       enabled: false
 
-      # healthEnabled enables health check service
-      healthEnabled: false
-
-      # healthEndpointName sets the health check path.
-      # It defaults to hello if health check is enabled and it is not set.
-      healthEndpointName: ""
-
-      # healthEndpointPort sets the health check port.
-      # It defaults to 8083 if health check is enabled and it is not set.
-      healthEndpointPort:
-
       # type specifies type of the service.
       type: ClusterIP
 
@@ -778,6 +767,31 @@ tyk-pump:
       # annotations specifies annotations to be added Tyk Pump service.
       annotations: {}
 
+    healthCheckService:
+      # type specifies type of the service.
+      type: ClusterIP
+
+      # Tyk Pump health service is disabled by default.
+      # Set it to true to enable it.
+      enabled: true
+
+      # path sets the health check path.
+      path: "hello"
+
+      # port sets the health check port.
+      # It defaults to 8083 if health check is enabled and it is not set.
+      port: 8083
+
+      # The name for the health check service port
+      portName: ""
+
+      # annotations specifies annotations to be added Tyk Pump service.
+      annotations: {}
+
+      # externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or
+      # cluster-wide endpoints, while using LoadBalancer type of service.
+      externalTrafficPolicy: Local
+
     # containerPort represents the port where Tyk Pump serve the metrics, for instance metrics for Prometheus.
     # The default port is 9090.
     containerPort: 9090