diff --git a/infrastructure/charts/agent/templates/deployment.yaml b/infrastructure/charts/agent/templates/deployment.yaml
index 17266fc5f8..22f85c74bc 100644
--- a/infrastructure/charts/agent/templates/deployment.yaml
+++ b/infrastructure/charts/agent/templates/deployment.yaml
@@ -56,19 +56,11 @@ spec:
         image: "{{ .Values.server.image.repository }}/{{ .Values.server.image.tag }}:{{ .Values.server.image.version | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.server.image.pullPolicy }}
         livenessProbe:
-          httpGet:
-            path: /_system/health
-            port: 8085
-          initialDelaySeconds: 10
-          periodSeconds: 5
-        readinessProbe:
-          httpGet:
-            path: /_system/health
-            port: 8085
-          initialDelaySeconds: 5
-          periodSeconds: 5
+          {{- toYaml .Values.server.livenessProbe | nindent 10 }}
+        startupProbe:
+          {{- toYaml .Values.server.startupProbe | nindent 10 }}
         resources:
-            {{- toYaml .Values.server.resources | nindent 12 }}
+          {{- toYaml .Values.server.resources | nindent 10 }}
         ports:
         - containerPort: 8085
         - containerPort: 8090
diff --git a/infrastructure/charts/agent/values.yaml b/infrastructure/charts/agent/values.yaml
index 2b8a57cad2..4ca29b7873 100644
--- a/infrastructure/charts/agent/values.yaml
+++ b/infrastructure/charts/agent/values.yaml
@@ -31,6 +31,18 @@ server:
     requests:
       cpu: 250m
       memory: 512Mi
+  livenessProbe:
+    httpGet:
+      path: /_system/health
+      port: 8085
+    failureThreshold: 1
+    periodSeconds: 10
+  startupProbe:
+    httpGet:
+      path: /_system/health
+      port: 8085
+    failureThreshold: 30
+    periodSeconds: 10
   # Additional environment variables to be added to the server container
   additionalEnvVariables: {}
   useVault: true