diff --git a/charts/warpstream-agent/CHANGELOG.md b/charts/warpstream-agent/CHANGELOG.md
index cfc9b62..bbc6582 100644
--- a/charts/warpstream-agent/CHANGELOG.md
+++ b/charts/warpstream-agent/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.13.56] - 2024-11-22
+
+### Added
+
+- Make the ConfigMap optional.
+- Add affinity for diagnose pods.
+
 ## [0.13.55] - 2024-11-21
 
 ### Added
diff --git a/charts/warpstream-agent/Chart.yaml b/charts/warpstream-agent/Chart.yaml
index 8611781..2ba5ef2 100644
--- a/charts/warpstream-agent/Chart.yaml
+++ b/charts/warpstream-agent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: warpstream-agent
 description: WarpStream Agent for Kubernetes.
 type: application
-version: 0.13.55
+version: 0.13.56
 appVersion: v601
 icon: https://avatars.githubusercontent.com/u/132156278
 home: https://docs.warpstream.com/warpstream/
diff --git a/charts/warpstream-agent/templates/configmap.yaml b/charts/warpstream-agent/templates/configmap.yaml
index 681a393..3d6fed9 100644
--- a/charts/warpstream-agent/templates/configmap.yaml
+++ b/charts/warpstream-agent/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{- if ne .Values.config.configMapEnabled false }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -20,3 +21,4 @@ data:
   {{- end }}
   WARPSTREAM_REGION: {{ .Values.config.region | quote }}
   {{- end }}
+{{- end }}
diff --git a/charts/warpstream-agent/templates/deployment.yaml b/charts/warpstream-agent/templates/deployment.yaml
index 99fbd32..06c7ef4 100644
--- a/charts/warpstream-agent/templates/deployment.yaml
+++ b/charts/warpstream-agent/templates/deployment.yaml
@@ -140,8 +140,13 @@ spec:
             {{- toYaml .Values.extraEnv | nindent 12 }}
           {{- end }}
           envFrom:
+          {{- if ne .Values.config.configMapEnabled false }}
             - configMapRef:
                 name: {{ include "warpstream-agent.fullname" . }}
+          {{- else }}
+            - secretRef:
+                name: {{ include "warpstream-agent.secretName" . }}
+          {{- end }}
           ports:
             - name: kafka
               containerPort: 9092
@@ -183,4 +188,4 @@ spec:
       {{- with .Values.volumes }}
       volumes:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
\ No newline at end of file
+      {{- end }}
diff --git a/charts/warpstream-agent/templates/tests/test-connection.yaml b/charts/warpstream-agent/templates/tests/test-connection.yaml
index bb1b17f..a051466 100644
--- a/charts/warpstream-agent/templates/tests/test-connection.yaml
+++ b/charts/warpstream-agent/templates/tests/test-connection.yaml
@@ -18,3 +18,7 @@ spec:
         - -type
         - diagnose-connection
   restartPolicy: Never
+  {{- with .Values.affinity }}
+  affinity:
+    {{- toYaml . | nindent 8 }}
+  {{- end }}
diff --git a/charts/warpstream-agent/values.yaml b/charts/warpstream-agent/values.yaml
index 309850c..a27879e 100644
--- a/charts/warpstream-agent/values.yaml
+++ b/charts/warpstream-agent/values.yaml
@@ -64,6 +64,8 @@ headlessService:
   enabled: true
 
 config:
+   # If set to false, configmap will not be created and secrets will be referenced in the deployemnt
+  configMapEnabled: true
   playground: false
   ## To learn what values to set for the config variables, look at our documentation
   ## for configuring the WarpStream Agents for production.