diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml b/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml
index fb31bb1e..92bbfd5e 100644
--- a/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml
+++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml
@@ -58,6 +58,7 @@ spec:
         - name: http
           containerPort: 8080
         readinessProbe:
+          {{- if .Values.readinessProbe.enabled }}
           initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
           timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
@@ -66,6 +67,8 @@ spec:
           httpGet:
             port: http
             path: /api/readyz
+          {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
           initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
@@ -75,6 +78,7 @@ spec:
           httpGet:
             port: http
             path: /api/healthz
+          {{- end }}
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
         volumeMounts:
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index 73d92c03..39b0ddc0 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -558,6 +558,7 @@ app-proxy:
     allowPrivilegeEscalation: false
 
   readinessProbe:
+    enabled: true
     # -- Minimum consecutive failures for the [probe] to be considered failed after having succeeded.
     failureThreshold: 3
     # -- Number of seconds after the container has started before [probe] is initiated.
@@ -570,6 +571,7 @@ app-proxy:
     timeoutSeconds: 10
 
   livenessProbe:
+    enabled: true
     # -- Minimum consecutive failures for the [probe] to be considered failed after having succeeded.
     failureThreshold: 10
     # -- Number of seconds after the container has started before [probe] is initiated.