diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 58a07c3d4..1719ff622 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -20,8 +20,6 @@ spec:
         - /manager
         args:
           - "--leader-elect"
-          - "--diagnostics-address=${CAPI_OPERATOR_DIAGNOSTICS_ADDRESS:=:8443}"
-          - "--insecure-diagnostics=${CAPI_OPERATOR_INSECURE_DIAGNOSTICS:=false}"
         image: controller:latest
         name: manager
         ports:
diff --git a/hack/charts/cluster-api-operator/templates/deployment.yaml b/hack/charts/cluster-api-operator/templates/deployment.yaml
index 8af8e3da8..34d1abbbb 100644
--- a/hack/charts/cluster-api-operator/templates/deployment.yaml
+++ b/hack/charts/cluster-api-operator/templates/deployment.yaml
@@ -63,6 +63,12 @@ spec:
         {{- if .Values.healthAddr }}
         - --health-addr={{ .Values.healthAddr }}
         {{- end }}
+        {{- if .Values.diagnosticsAddress }}
+        - --diagnostics-address={{ .Values.diagnosticsAddress }}
+        {{- end }}
+        {{- if .Values.insecureDiagnostics }}
+        - --insecure-diagnostics={{ .Values.insecureDiagnostics }}
+        {{- end }}
         {{- with .Values.leaderElection }}
         - --leader-elect={{ .enabled }}
         {{- if .leaseDuration }}
diff --git a/hack/charts/cluster-api-operator/values.yaml b/hack/charts/cluster-api-operator/values.yaml
index 08591e00a..07d856127 100644
--- a/hack/charts/cluster-api-operator/values.yaml
+++ b/hack/charts/cluster-api-operator/values.yaml
@@ -27,6 +27,8 @@ image:
     tag: dev
     pullPolicy: IfNotPresent
 healthAddr: ":8081"
+diagnosticsAddress: "8443"
+insecureDiagnostics: false
 imagePullSecrets: {}
 resources:
   manager:
diff --git a/test/e2e/resources/full-chart-install.yaml b/test/e2e/resources/full-chart-install.yaml
index ac4e58a43..2112a4e39 100644
--- a/test/e2e/resources/full-chart-install.yaml
+++ b/test/e2e/resources/full-chart-install.yaml
@@ -14091,6 +14091,7 @@ spec:
       - args:
         - --v=2
         - --health-addr=:8081
+        - --diagnostics-address=8443
         - --leader-elect=true
         command:
         - /manager