diff --git a/charts/openobserve/templates/alertmanager-statefulset.yaml b/charts/openobserve/templates/alertmanager-statefulset.yaml
index 2328136..1ecd352 100644
--- a/charts/openobserve/templates/alertmanager-statefulset.yaml
+++ b/charts/openobserve/templates/alertmanager-statefulset.yaml
@@ -20,7 +20,7 @@ spec:
   template:
     metadata:
       annotations:
-        {{- with .Values.podAnnotations }}
+        {{- with .Values.podAnnotations.alertmanager }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         checksum/specific-config: {{ include (print $.Template.BasePath "/alertmanager-configmap.yaml") . | sha256sum }}
diff --git a/charts/openobserve/templates/alertquerier-statefulset.yaml b/charts/openobserve/templates/alertquerier-statefulset.yaml
index e2b93a3..5393453 100644
--- a/charts/openobserve/templates/alertquerier-statefulset.yaml
+++ b/charts/openobserve/templates/alertquerier-statefulset.yaml
@@ -20,7 +20,7 @@ spec:
   template:
     metadata:
       annotations:
-        {{- with .Values.podAnnotations }}
+        {{- with .Values.podAnnotations.alertquerier }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         checksum/specific-config: {{ include (print $.Template.BasePath "/alertquerier-configmap.yaml") . | sha256sum }}
diff --git a/charts/openobserve/templates/compactor-deployment.yaml b/charts/openobserve/templates/compactor-deployment.yaml
index e8b6dbc..bd0b1f9 100644
--- a/charts/openobserve/templates/compactor-deployment.yaml
+++ b/charts/openobserve/templates/compactor-deployment.yaml
@@ -16,7 +16,7 @@ spec:
   template:
     metadata:
       annotations:
-        {{- with .Values.podAnnotations }}
+        {{- with .Values.podAnnotations.compactor }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         checksum/specific-config: {{ include (print $.Template.BasePath "/compactor-configmap.yaml") . | sha256sum }}
diff --git a/charts/openobserve/templates/dex-deployment.yaml b/charts/openobserve/templates/dex-deployment.yaml
index c00c70a..c0f74a0 100644
--- a/charts/openobserve/templates/dex-deployment.yaml
+++ b/charts/openobserve/templates/dex-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       {{- include "openobserve.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.enterprise.dex.podAnnotations }}
+      {{- with .Values.podAnnotations.dex }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/openobserve/templates/ingester-statefulset.yaml b/charts/openobserve/templates/ingester-statefulset.yaml
index 6729237..b510243 100644
--- a/charts/openobserve/templates/ingester-statefulset.yaml
+++ b/charts/openobserve/templates/ingester-statefulset.yaml
@@ -27,7 +27,7 @@ spec:
   template:
     metadata:
       annotations:
-        {{- with .Values.podAnnotations }}
+        {{- with .Values.podAnnotations.ingester }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         checksum/specific-config: {{ include (print $.Template.BasePath "/ingester-configmap.yaml") . | sha256sum }}
diff --git a/charts/openobserve/templates/querier-statefulset.yaml b/charts/openobserve/templates/querier-statefulset.yaml
index 2b91ff1..16bb890 100644
--- a/charts/openobserve/templates/querier-statefulset.yaml
+++ b/charts/openobserve/templates/querier-statefulset.yaml
@@ -20,7 +20,7 @@ spec:
   template:
     metadata:
       annotations:
-        {{- with .Values.podAnnotations }}
+        {{- with .Values.podAnnotations.querier }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         checksum/specific-config: {{ include (print $.Template.BasePath "/querier-configmap.yaml") . | sha256sum }}
diff --git a/charts/openobserve/templates/reportserver-delpoyment.yaml b/charts/openobserve/templates/reportserver-delpoyment.yaml
index 48afe58..1de1347 100644
--- a/charts/openobserve/templates/reportserver-delpoyment.yaml
+++ b/charts/openobserve/templates/reportserver-delpoyment.yaml
@@ -16,7 +16,7 @@ spec:
   template:
     metadata:
       annotations:
-        {{- with .Values.podAnnotations }}
+        {{- with .Values.podAnnotations.reportserver }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         checksum/specific-config: {{ include (print $.Template.BasePath "/reportserver-configmap.yaml") . | sha256sum }}
diff --git a/charts/openobserve/templates/router-deployment.yaml b/charts/openobserve/templates/router-deployment.yaml
index 85252d8..e307ad5 100644
--- a/charts/openobserve/templates/router-deployment.yaml
+++ b/charts/openobserve/templates/router-deployment.yaml
@@ -16,7 +16,7 @@ spec:
   template:
     metadata:
       annotations:
-        {{- with .Values.podAnnotations }}
+        {{- with .Values.podAnnotations.router }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         checksum/specific-config: {{ include (print $.Template.BasePath "/router-configmap.yaml") . | sha256sum }}
diff --git a/charts/openobserve/templates/zplane-deployment.yaml b/charts/openobserve/templates/zplane-deployment.yaml
index ca28188..db55ccd 100644
--- a/charts/openobserve/templates/zplane-deployment.yaml
+++ b/charts/openobserve/templates/zplane-deployment.yaml
@@ -14,7 +14,7 @@ spec:
       role: zplane
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with .Values.podAnnotations.zplane }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/openobserve/test_values_external_secret.yaml b/charts/openobserve/test_values_external_secret.yaml
index c622c92..00969d3 100644
--- a/charts/openobserve/test_values_external_secret.yaml
+++ b/charts/openobserve/test_values_external_secret.yaml
@@ -34,7 +34,16 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-podAnnotations: {}
+podAnnotations:
+  ingester: {}
+  querier: {}
+  compactor: {}
+  router: {}
+  alertmanager: {}
+  dex: {}
+  reportserver: {}
+  alertquerier: {}
+  zplane: {}
 
 labels: {}
 
diff --git a/charts/openobserve/values.yaml b/charts/openobserve/values.yaml
index e89dbff..1f61f4c 100644
--- a/charts/openobserve/values.yaml
+++ b/charts/openobserve/values.yaml
@@ -34,7 +34,16 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-podAnnotations: {}
+podAnnotations:
+  ingester: {}
+  querier: {}
+  compactor: {}
+  router: {}
+  alertmanager: {}
+  dex: {}
+  reportserver: {}
+  alertquerier: {}
+  zplane: {}
 
 labels: {}
 
@@ -951,7 +960,6 @@ enterprise:
       tag: v2.37.0
       pullPolicy: IfNotPresent
     extraEnv: []
-    podAnnotations: {}
     ingress:
       enabled: true
       className: "nginx"