diff --git a/promitor-agent-resource-discovery/templates/configmap.yaml b/promitor-agent-resource-discovery/templates/configmap.yaml
index a1a9d5b..f803944 100644
--- a/promitor-agent-resource-discovery/templates/configmap.yaml
+++ b/promitor-agent-resource-discovery/templates/configmap.yaml
@@ -26,6 +26,10 @@ data:
         applicationInsights:
   {{- if .Values.telemetry.applicationInsights.key }}
           instrumentationKey: {{ .Values.telemetry.applicationInsights.key | quote }}
+  {{- end }}
+  {{- if .Values.azureAuthentication.identity.appKeySecretFilePath }}
+        appKeySecretFilePath: {{ .Values.azureAuthentication.identity.appKeySecretFilePath}}
+        appKeySecretName: {{ .Values.azureAuthentication.identity.appKeySecretName}}
   {{- end }}
           isEnabled: {{ .Values.telemetry.applicationInsights.enabled | quote }}
   {{- if .Values.telemetry.applicationInsights.logLevel }}
diff --git a/promitor-agent-resource-discovery/values.yaml b/promitor-agent-resource-discovery/values.yaml
index 768d1a5..3e28b4e 100644
--- a/promitor-agent-resource-discovery/values.yaml
+++ b/promitor-agent-resource-discovery/values.yaml
@@ -19,6 +19,8 @@ azureAuthentication:
   identity:
     id: ""
     key: ""
+    appKeySecretFilePath: "" # The path to the secret file
+    appKeySecretFileName: "" # The file that contains the secret value
     binding: ""
 
 cache:
diff --git a/promitor-agent-scraper/templates/configmap.yaml b/promitor-agent-scraper/templates/configmap.yaml
index bf3caf8..1dbb60b 100644
--- a/promitor-agent-scraper/templates/configmap.yaml
+++ b/promitor-agent-scraper/templates/configmap.yaml
@@ -18,6 +18,10 @@ data:
   {{- else if .Values.azureAuthentication.appId }}
         identityId: {{ .Values.azureAuthentication.appId}}
   {{- end }}
+  {{- if .Values.azureAuthentication.identity.appKeySecretFilePath }}
+        appKeySecretFilePath: {{ .Values.azureAuthentication.identity.appKeySecretFilePath}}
+        appKeySecretName: {{ .Values.azureAuthentication.identity.appKeySecretName}}
+  {{- end }}
   {{- if .Values.resourceDiscovery.enabled }}
       resourceDiscovery:
         host: {{ .Values.resourceDiscovery.host | quote }}
@@ -29,6 +33,11 @@ data:
           host: {{ .Values.metricSinks.statsd.host | quote }}
   {{- if .Values.metricSinks.statsd.port }}
           port: {{ .Values.metricSinks.statsd.port | quote }}
+  {{- end }}
+   {{- if eq .Values.metricSinks.statsd.formattertype "custom" }}
+          account: {{ .Values.metricSinks.statsd.account | quote }}
+          namespace: {{ .Values.metricSinks.statsd.namespace | quote }}
+          formattertype: {{ .Values.metricSinks.statsd.formattertype | quote }}
   {{- end }}
   {{- if .Values.metricSinks.statsd.metricPrefix }}
           metricPrefix: {{ .Values.metricSinks.statsd.metricPrefix | quote }}
diff --git a/promitor-agent-scraper/values.yaml b/promitor-agent-scraper/values.yaml
index ab722ae..be21718 100644
--- a/promitor-agent-scraper/values.yaml
+++ b/promitor-agent-scraper/values.yaml
@@ -19,6 +19,8 @@ azureAuthentication:
   identity:
     id: ""
     key: ""
+    appKeySecretFilePath: "" # The path to the secret file
+    appKeySecretFileName: "" # The file that contains the secret value
     binding: ""
 metricSinks:
   atlassianStatuspage:
@@ -51,6 +53,9 @@ metricSinks:
     host: ""
     port: 8125
     metricPrefix: ""
+    namespace: "" # Custom field when using custom formatter type
+    account: "" # Custom field when using custom formatter type
+    formattertype: "default" # Can be set to default or custom
 prometheusRule:
   enabled: false
   namespace: ""