diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 231a0f63e46..1c93cd15f29 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources:
 type: library
-version: 6.3.7
+version: 6.3.8
diff --git a/charts/library/common/templates/lib/controller/_probes.tpl b/charts/library/common/templates/lib/controller/_probes.tpl
index 379815729e8..4222d3c97ed 100644
--- a/charts/library/common/templates/lib/controller/_probes.tpl
+++ b/charts/library/common/templates/lib/controller/_probes.tpl
@@ -7,7 +7,7 @@ Probes selection logic.
 {{- if $primaryService -}}
   {{- $primaryPort = get $primaryService.ports (include "common.classes.service.ports.primary" (dict "serviceName" (include "common.service.primary" .) "values" $primaryService)) -}}
 {{- end -}}
-{{- $probeType := "HTTP" -}}
+{{- $probeType := "TCP" -}}
 
 {{- range $probeName, $probe := .Values.probes }}
   {{- if $probe.enabled -}}
@@ -17,13 +17,13 @@ Probes selection logic.
       {{- $probe.spec | toYaml | nindent 2 }}
     {{- else }}
       {{- if and $primaryService $primaryPort -}}
-        {{- if $probe.type -}}
-          {{- $probeType = $probe.type -}}
-        {{- else -}}
-          {{- if $primaryPort.protocol -}}
-            {{- $probeType = $primaryPort.protocol -}}
+          {{- if $probe.type -}}
+            {{- if eq $probe.type "AUTO" -}}
+              {{- $probeType = $primaryPort.protocol -}}
+            {{- else -}}
+              {{- $probeType := $probe.type -}}
+            {{- end }}
           {{- end }}
-        {{- end }}
 
           {{- if or ( eq $probeType "HTTPS" ) ( eq $probeType "HTTP" ) -}}
               {{- "httpGet:" | nindent 2 }}
diff --git a/charts/library/common/values.yaml b/charts/library/common/values.yaml
index 345a18a33ef..f73f8771df6 100644
--- a/charts/library/common/values.yaml
+++ b/charts/library/common/values.yaml
@@ -153,6 +153,9 @@ probes:
     enabled: true
     # -- Set this to `true` if you wish to specify your own livenessProbe
     custom: false
+    # -- sets the probe type when not using a custom probe
+    # @default -- "TCP"
+    type: TCP
     # -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
     # @default -- "/"
     path: "/"
@@ -172,6 +175,9 @@ probes:
     enabled: true
     # -- Set this to `true` if you wish to specify your own readinessProbe
     custom: false
+    # -- sets the probe type when not using a custom probe
+    # @default -- "TCP"
+    type: TCP
     # -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
     # @default -- "/"
     path: "/"
@@ -191,6 +197,9 @@ probes:
     enabled: true
     # -- Set this to `true` if you wish to specify your own startupProbe
     custom: false
+    # -- sets the probe type when not using a custom probe
+    # @default -- "TCP"
+    type: TCP
     # -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
     # @default -- "/"
     path: "/"