diff --git a/chart/dapr-shared/templates/_daemondeployshared.yaml b/chart/dapr-shared/templates/_daemondeployshared.yaml
index 28d5446..51f4fea 100644
--- a/chart/dapr-shared/templates/_daemondeployshared.yaml
+++ b/chart/dapr-shared/templates/_daemondeployshared.yaml
@@ -34,6 +34,9 @@
           args:
             - init
             - --config-map={{ .Release.Name }}-shared-cm
+          env:
+          - name: DAPR_CONTROL_PLANE_NAMESPACE
+            value: {{ default "dapr-system" .Values.shared.controlPlane.namespace }}
       containers:
         - name: daprd
           securityContext:
@@ -62,6 +65,7 @@
           - --enable-api-logging={{ .Values.shared.daprd.apiLogging.enabled }}
           - --app-channel-address={{ .Values.shared.remoteURL }}
           - --config={{ .Values.shared.daprd.config }}
+          - --disable-builtin-k8s-secret-store={{ default "false" .Values.shared.daprd.disableBuiltinK8sSecretStore }}
           {{- if .Values.shared.daprd.appHealth.enabled }}
           - --enable-app-health-check={{ .Values.shared.daprd.appHealth.enabled }}
           - --app-health-check-path={{ default "/healthz" .Values.shared.daprd.appHealth.checkPath }}