diff --git a/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml
index d8994de19..17b54774b 100644
--- a/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml
+++ b/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml
@@ -48,11 +48,11 @@ spec:
       labels:
         {{- include "pulsar.template.labels" . | nindent 8 }}
         component: {{ .Values.streamnative_console.component }}
-{{- with .Values.streamnative_console.labels }}
+{{- with .Values.streamnative_console.podLabels }}
 {{ toYaml . | indent 8 }}
 {{- end }}
       annotations:
-{{- with .Values.streamnative_console.annotations }}
+{{- with .Values.streamnative_console.podAnnotations }}
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:
diff --git a/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml b/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml
index 542e5d8b6..de288f866 100644
--- a/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml
+++ b/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml
@@ -48,14 +48,14 @@ spec:
       labels:
         {{- include "pulsar.template.labels" . | nindent 8 }}
         component: {{ .Values.toolset.component }}
-{{- with .Values.toolset.labels }}
+{{- with .Values.toolset.podLabels }}
 {{ toYaml . | indent 8 }}
 {{- end }}
       annotations:
         {{- if .Values.toolset.autoRollDeployment }}
         checksum/config: {{ include (print $.Template.BasePath "/toolset/toolset-configmap.yaml") . | sha256sum }}
         {{- end }}
-{{- with .Values.toolset.annotations }}
+{{- with .Values.toolset.podAnnotations }}
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:
diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml
index 6a52c73ab..cfeac0fc3 100644
--- a/charts/sn-platform-slim/values.yaml
+++ b/charts/sn-platform-slim/values.yaml
@@ -1561,6 +1561,8 @@ toolset:
     # cloud.google.com/gke-nodepool: default-pool
   labels: {}
   annotations: {}
+  podLabels: {}
+  podAnnotations: {}
   tolerations: []
   gracePeriod: 0
   resources:
@@ -1985,6 +1987,8 @@ streamnative_console:
     # cloud.google.com/gke-nodepool: default-pool
   labels: {}
   annotations: {}
+  podLabels: {}
+  podAnnotations: {}
   tolerations: []
   gracePeriod: 0
   # Resources requests/limits for both init containers and app containers
diff --git a/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml
index 64c69d6aa..d57140797 100644
--- a/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml
+++ b/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml
@@ -48,11 +48,11 @@ spec:
       labels:
         {{- include "pulsar.template.labels" . | nindent 8 }}
         component: {{ .Values.streamnative_console.component }}
-{{- with .Values.streamnative_console.labels }}
+{{- with .Values.streamnative_console.podLabels }}
 {{ toYaml . | indent 8 }}
 {{- end }}
       annotations:
-{{- with .Values.streamnative_console.annotations }}
+{{- with .Values.streamnative_console.podAnnotations }}
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:
diff --git a/charts/sn-platform/templates/toolset/toolset-statefulset.yaml b/charts/sn-platform/templates/toolset/toolset-statefulset.yaml
index b4f9e8b24..2745c1387 100644
--- a/charts/sn-platform/templates/toolset/toolset-statefulset.yaml
+++ b/charts/sn-platform/templates/toolset/toolset-statefulset.yaml
@@ -48,14 +48,14 @@ spec:
       labels:
         {{- include "pulsar.template.labels" . | nindent 8 }}
         component: {{ .Values.toolset.component }}
-{{- with .Values.toolset.labels }}
+{{- with .Values.toolset.podLabels }}
 {{ toYaml . | indent 8 }}
 {{- end }}
       annotations:
         {{- if .Values.toolset.autoRollDeployment }}
         checksum/config: {{ include (print $.Template.BasePath "/toolset/toolset-configmap.yaml") . | sha256sum }}
         {{- end }}
-{{- with .Values.toolset.annotations }}
+{{- with .Values.toolset.podAnnotations }}
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:
diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml
index 773226819..da06c6ea1 100644
--- a/charts/sn-platform/values.yaml
+++ b/charts/sn-platform/values.yaml
@@ -1637,6 +1637,8 @@ toolset:
     # cloud.google.com/gke-nodepool: default-pool
   labels: {}
   annotations: {}
+  podLabels: {}
+  podAnnotations: {}
   tolerations: []
   kafka:
     enabled: false
@@ -2072,6 +2074,8 @@ streamnative_console:
     # cloud.google.com/gke-nodepool: default-pool
   labels: {}
   annotations: {}
+  podLabels: {}
+  podAnnotations: {}
   tolerations: []
   gracePeriod: 0
   # Resources requests/limits for both init containers and app containers