diff --git a/charts/bpdm/charts/bpdm-orchestrator/templates/deployment.yaml b/charts/bpdm/charts/bpdm-orchestrator/templates/deployment.yaml
index a7df00413..2e11350c1 100644
--- a/charts/bpdm/charts/bpdm-orchestrator/templates/deployment.yaml
+++ b/charts/bpdm/charts/bpdm-orchestrator/templates/deployment.yaml
@@ -64,11 +64,25 @@ spec:
               protocol: TCP
           # @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-setting-up-health-checks-with-readiness-and-liveness-probes
           livenessProbe:
-            {{- toYaml .Values.livenessProbe | nindent 12}}
+            httpGet:
+              path: {{.Values.livenessProbe.path}}
+              port: {{.Values.livenessProbe.port}}
+              scheme: HTTP
+            initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}}
+            periodSeconds: {{.Values.livenessProbe.periodSeconds}}
+            timeoutSeconds: {{.Values.livenessProbe.timeoutSeconds}}
+            successThreshold: {{.Values.livenessProbe.successThreshold}}
+            failureThreshold: {{.Values.livenessProbe.failureThreshold}}
           readinessProbe:
-            {{- toYaml .Values.readinessProbe | nindent 12}}
-          startupProbe:
-            {{- toYaml .Values.startupProbe | nindent 12}}
+            httpGet:
+              path: {{.Values.readinessProbe.path}}
+              port: {{.Values.readinessProbe.port}}
+              scheme: HTTP
+            initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}}
+            periodSeconds: {{.Values.readinessProbe.periodSeconds}}
+            timeoutSeconds: {{.Values.readinessProbe.timeoutSeconds}}
+            successThreshold: {{.Values.readinessProbe.successThreshold}}
+            failureThreshold: {{.Values.readinessProbe.failureThreshold}}
           resources:
             {{- toYaml .Values.resources | nindent 12}}
           volumeMounts:
diff --git a/charts/bpdm/charts/bpdm-orchestrator/values.yaml b/charts/bpdm/charts/bpdm-orchestrator/values.yaml
index c08691982..67c006e4c 100644
--- a/charts/bpdm/charts/bpdm-orchestrator/values.yaml
+++ b/charts/bpdm/charts/bpdm-orchestrator/values.yaml
@@ -84,33 +84,28 @@ affinity:
           topologyKey: kubernetes.io/hostname
 
 livenessProbe:
-  httpGet:
-    path: "/actuator/health/liveness"
-    port: 8085
-    scheme: HTTP
   failureThreshold: 3
-  initialDelaySeconds: 5
-  periodSeconds: 5
+  # -- Number of seconds to wait before performing the first liveness probe
+  initialDelaySeconds: 60
+  # -- Number of seconds to wait between consecutive probes
+  periodSeconds: 10
+  # -- Number of consecutive successful probes before a pod is considered healthy
   successThreshold: 1
-  timeoutSeconds: 1
+  # -- Number of seconds after which a liveness probe times out
+  timeoutSeconds: 10
+  # -- HTTP endpoint
+  path: /actuator/health/readiness
+  # -- Port used
+  port: 8085
+# -- Determine when a pod is ready to start accepting requests
 readinessProbe:
-  httpGet:
-    path: "/actuator/health/readiness"
-    port: 8085
-    scheme: HTTP
   failureThreshold: 3
-  initialDelaySeconds: 5
-  periodSeconds: 5
-  successThreshold: 1
-  timeoutSeconds: 1
-startupProbe:
-  httpGet:
-    path: "/actuator/health/readiness"
-    port: 8085
-    scheme: HTTP
   initialDelaySeconds: 60
-  failureThreshold: 20
-  periodSeconds: 15
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 10
+  path: /actuator/health/readiness
+  port: 8085
 
 
 # Used to overwrite the default property values of the application configuration