diff --git a/charts/api7/Chart.yaml b/charts/api7/Chart.yaml
index 559c41e..28b6ab5 100644
--- a/charts/api7/Chart.yaml
+++ b/charts/api7/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.17.29
+version: 0.17.30
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/api7/README.md b/charts/api7/README.md
index 8c41ae8..abb5e58 100644
--- a/charts/api7/README.md
+++ b/charts/api7/README.md
@@ -1,6 +1,6 @@
 # api7ee3
 
-![Version: 0.17.29](https://img.shields.io/badge/Version-0.17.29-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.16](https://img.shields.io/badge/AppVersion-3.8.16-informational?style=flat-square)
+![Version: 0.17.30](https://img.shields.io/badge/Version-0.17.30-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.16](https://img.shields.io/badge/AppVersion-3.8.16-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -39,6 +39,7 @@ A Helm chart for Kubernetes
 | dashboard.readinessProbe.initialDelaySeconds | int | `10` |  |
 | dashboard.readinessProbe.periodSeconds | int | `3` |  |
 | dashboard.replicaCount | int | `1` |  |
+| dashboard.topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pod assignment https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ The value is evaluated as a template |
 | dashboard_configuration.audit.retention_days | int | `60` |  |
 | dashboard_configuration.console.addr | string | `"http://127.0.0.1:3000"` |  |
 | dashboard_configuration.consumer_proxy.cache_failure_count | int | `512` |  |
@@ -114,6 +115,7 @@ A Helm chart for Kubernetes
 | developer_portal.readinessProbe.initialDelaySeconds | int | `10` |  |
 | developer_portal.readinessProbe.periodSeconds | int | `3` |  |
 | developer_portal.replicaCount | int | `1` |  |
+| developer_portal.topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pod assignment https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ The value is evaluated as a template |
 | developer_portal_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` |  |
 | developer_portal_configuration.database.max_idle_time | string | `"30s"` |  |
 | developer_portal_configuration.database.max_open_conns | int | `30` |  |
@@ -152,6 +154,7 @@ A Helm chart for Kubernetes
 | dp_manager.readinessProbe.initialDelaySeconds | int | `10` |  |
 | dp_manager.readinessProbe.periodSeconds | int | `3` |  |
 | dp_manager.replicaCount | int | `1` |  |
+| dp_manager.topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pod assignment https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ The value is evaluated as a template |
 | dp_manager_configuration.consumer_cache.evict_interval | string | `"5s"` |  |
 | dp_manager_configuration.consumer_cache.max_ttl | string | `"2h"` |  |
 | dp_manager_configuration.consumer_cache.size | int | `50000` |  |
diff --git a/charts/api7/templates/dashboard-deploy.yaml b/charts/api7/templates/dashboard-deploy.yaml
index c23e2e0..d59c0de 100644
--- a/charts/api7/templates/dashboard-deploy.yaml
+++ b/charts/api7/templates/dashboard-deploy.yaml
@@ -136,7 +136,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.topologySpreadConstraints }}
+      {{- with or .Values.dashboard.topologySpreadConstraints .Values.topologySpreadConstraints }}
       topologySpreadConstraints:
         {{- tpl (. | toYaml) $ | nindent 8 }}
       {{- end }}
diff --git a/charts/api7/templates/developer-portal-deploy.yaml b/charts/api7/templates/developer-portal-deploy.yaml
index 4de4eab..cedfa41 100644
--- a/charts/api7/templates/developer-portal-deploy.yaml
+++ b/charts/api7/templates/developer-portal-deploy.yaml
@@ -110,7 +110,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.topologySpreadConstraints }}
+      {{- with or .Values.developer_portal.topologySpreadConstraints .Values.topologySpreadConstraints }}
       topologySpreadConstraints:
         {{- tpl (. | toYaml) $ | nindent 8 }}
       {{- end }}
diff --git a/charts/api7/templates/dp-manager-deploy.yaml b/charts/api7/templates/dp-manager-deploy.yaml
index 0180c4f..62cdd8b 100644
--- a/charts/api7/templates/dp-manager-deploy.yaml
+++ b/charts/api7/templates/dp-manager-deploy.yaml
@@ -121,7 +121,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.topologySpreadConstraints }}
+      {{- with or .Values.dp_manager.topologySpreadConstraints .Values.topologySpreadConstraints }}
       topologySpreadConstraints:
         {{- tpl (. | toYaml) $ | nindent 8 }}
       {{- end }}
diff --git a/charts/api7/values.yaml b/charts/api7/values.yaml
index f000e38..92cd10b 100644
--- a/charts/api7/values.yaml
+++ b/charts/api7/values.yaml
@@ -35,6 +35,10 @@ dashboard:
   extraVolumes: []
   extraVolumeMounts: []
   podLabels: {}
+  # -- Topology Spread Constraints for pod assignment
+  # https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
+  # The value is evaluated as a template
+  topologySpreadConstraints: []
   livenessProbe:
     initialDelaySeconds: 180
     periodSeconds: 10
@@ -67,6 +71,10 @@ dp_manager:
   extraVolumes: []
   extraVolumeMounts: []
   podLabels: {}
+  # -- Topology Spread Constraints for pod assignment
+  # https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
+  # The value is evaluated as a template
+  topologySpreadConstraints: []
   livenessProbe:
     initialDelaySeconds: 60
     periodSeconds: 3
@@ -90,6 +98,10 @@ developer_portal:
   extraVolumes: []
   extraVolumeMounts: []
   podLabels: {}
+  # -- Topology Spread Constraints for pod assignment
+  # https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
+  # The value is evaluated as a template
+  topologySpreadConstraints: []
   livenessProbe:
     initialDelaySeconds: 60
     periodSeconds: 3