diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index bff2f90276b10..61bac4eaa278d 100644
--- a/helm/superset/Chart.yaml
+++ b/helm/superset/Chart.yaml
@@ -29,7 +29,7 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.9.3
+version: 0.9.4
 dependencies:
   - name: postgresql
     version: 12.1.6
diff --git a/helm/superset/README.md b/helm/superset/README.md
index 9a6c334c3bed8..1df7023967734 100644
--- a/helm/superset/README.md
+++ b/helm/superset/README.md
@@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
 
 # superset
 
-![Version: 0.9.3](https://img.shields.io/badge/Version-0.9.3-informational?style=flat-square)
+![Version: 0.9.4](https://img.shields.io/badge/Version-0.9.4-informational?style=flat-square)
 
 Apache Superset is a modern, enterprise-ready business intelligence web application
 
@@ -67,6 +67,7 @@ helm install my-superset superset/superset
 | extraSecrets | object | `{}` | Extra files to mount on `/app/pythonpath` as secrets |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
+| fullnameOverride | string | `nil` | Provide a name to override the full names of resources |
 | hostAliases | list | `[]` | Custom hostAliases for all superset pods # https://kubernetes.io/docs/tasks/network/customize-hosts-file-for-pods/ |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"apache/superset"` |  |
@@ -76,6 +77,7 @@ helm install my-superset superset/superset
 | ingress.enabled | bool | `false` |  |
 | ingress.extraHostsRaw | list | `[]` |  |
 | ingress.hosts[0] | string | `"chart-example.local"` |  |
+| ingress.ingressClassName | string | `nil` |  |
 | ingress.path | string | `"/"` |  |
 | ingress.pathType | string | `"ImplementationSpecific"` |  |
 | ingress.tls | list | `[]` |  |
@@ -101,6 +103,7 @@ helm install my-superset superset/superset
 | initImage.pullPolicy | string | `"IfNotPresent"` |  |
 | initImage.repository | string | `"jwilder/dockerize"` |  |
 | initImage.tag | string | `"latest"` |  |
+| nameOverride | string | `nil` | Provide a name to override the name of the chart |
 | nodeSelector | object | `{}` |  |
 | postgresql | object | see `values.yaml` | Configuration values for the postgresql dependency. ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md |
 | redis | object | see `values.yaml` | Configuration values for the Redis dependency. ref: https://github.com/bitnami/charts/blob/master/bitnami/redis More documentation can be found here: https://artifacthub.io/packages/helm/bitnami/redis |
@@ -112,7 +115,8 @@ helm install my-superset superset/superset
 | service.port | int | `8088` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceAccount.annotations | object | `{}` |  |
-| serviceAccount.create | bool | `false` | Create custom service account for Superset. If create: true and name is not provided, `superset.fullname` will be used. |
+| serviceAccount.create | bool | `false` | Create custom service account for Superset. If create: true and serviceAccountName is not provided, `superset.fullname` will be used. |
+| serviceAccountName | string | `nil` | Specify service account name to be used |
 | supersetCeleryBeat.affinity | object | `{}` | Affinity to be added to supersetCeleryBeat deployment |
 | supersetCeleryBeat.command | list | a `celery beat` command | Command |
 | supersetCeleryBeat.containerSecurityContext | object | `{}` |  |
@@ -151,6 +155,7 @@ helm install my-superset superset/superset
 | supersetCeleryFlower.replicaCount | int | `1` |  |
 | supersetCeleryFlower.resources | object | `{}` | Resource settings for the CeleryBeat pods - these settings overwrite might existing values from the global resources object defined above. |
 | supersetCeleryFlower.service.annotations | object | `{}` |  |
+| supersetCeleryFlower.service.loadBalancerIP | string | `nil` |  |
 | supersetCeleryFlower.service.nodePort.http | int | `"nil"` |  |
 | supersetCeleryFlower.service.port | int | `5555` |  |
 | supersetCeleryFlower.service.type | string | `"ClusterIP"` |  |
@@ -237,6 +242,7 @@ helm install my-superset superset/superset
 | supersetWebsockets.replicaCount | int | `1` |  |
 | supersetWebsockets.resources | object | `{}` |  |
 | supersetWebsockets.service.annotations | object | `{}` |  |
+| supersetWebsockets.service.loadBalancerIP | string | `nil` |  |
 | supersetWebsockets.service.nodePort.http | int | `"nil"` |  |
 | supersetWebsockets.service.port | int | `8080` |  |
 | supersetWebsockets.service.type | string | `"ClusterIP"` |  |
@@ -249,6 +255,7 @@ helm install my-superset superset/superset
 | supersetWebsockets.startupProbe.timeoutSeconds | int | `1` |  |
 | supersetWebsockets.strategy | object | `{}` |  |
 | supersetWebsockets.topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to be added to supersetWebsockets deployments |
+| supersetWorker.affinity | object | `{}` | Affinity to be added to supersetWorker deployment |
 | supersetWorker.command | list | a `celery worker` command | Worker startup command |
 | supersetWorker.containerSecurityContext | object | `{}` |  |
 | supersetWorker.deploymentAnnotations | object | `{}` | Annotations to be added to supersetWorker deployment |
@@ -270,5 +277,6 @@ helm install my-superset superset/superset
 | supersetWorker.resources | object | `{}` | Resource settings for the supersetWorker pods - these settings overwrite might existing values from the global resources object defined above. |
 | supersetWorker.startupProbe | object | `{}` | No startup/readiness probes by default since we don't really care about its startup time (it doesn't serve traffic) |
 | supersetWorker.strategy | object | `{}` |  |
+| supersetWorker.topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to be added to supersetWorker deployments |
 | tolerations | list | `[]` |  |
 | topologySpreadConstraints | list | `[]` | TopologySpreadConstrains to be added to all deployments |
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index 339833237939d..de8bc93ca5279 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -22,13 +22,19 @@
 # A README is automatically generated from this file to document it, using helm-docs (see https://github.com/norwoodj/helm-docs)
 # To update it, install helm-docs and run helm-docs from the root of this chart
 
+# -- Provide a name to override the name of the chart
+nameOverride: ~
+# -- Provide a name to override the full names of resources
+fullnameOverride: ~
+
 # -- User ID directive. This user must have enough permissions to run the bootstrap script
 # Running containers as root is not recommended in production. Change this to another UID - e.g. 1000 to be more secure
 runAsUser: 0
 
-# serviceAccountName: superset
+# -- Specify service account name to be used
+serviceAccountName: ~
 serviceAccount:
-  # -- Create custom service account for Superset. If create: true and name is not provided, `superset.fullname` will be used.
+  # -- Create custom service account for Superset. If create: true and serviceAccountName is not provided, `superset.fullname` will be used.
   create: false
   annotations: {}
 
@@ -184,17 +190,16 @@ initImage:
 service:
   type: ClusterIP
   port: 8088
-  annotations:
-    {}
+  annotations: {}
     # cloud.google.com/load-balancer-type: "Internal"
-  loadBalancerIP: null
+  loadBalancerIP: ~
   nodePort:
     # -- (int)
     http: nil
 
 ingress:
   enabled: false
-  # ingressClassName: nginx
+  ingressClassName: ~
   annotations: {}
     # kubernetes.io/tls-acme: "true"
     ## Extend timeout to allow long running queries.
@@ -356,6 +361,10 @@ supersetWorker:
   deploymentAnnotations: {}
   # -- Labels to be added to supersetWorker deployment
   deploymentLabels: {}
+  # -- Affinity to be added to supersetWorker deployment
+  affinity: {}
+  # -- TopologySpreadConstrains to be added to supersetWorker deployments
+  topologySpreadConstraints: []
   # -- Annotations to be added to supersetWorker pods
   podAnnotations: {}
   # -- Labels to be added to supersetWorker pods
@@ -454,6 +463,7 @@ supersetCeleryFlower:
   service:
     type: ClusterIP
     annotations: {}
+    loadBalancerIP: ~
     port: 5555
     nodePort:
       # -- (int)
@@ -557,6 +567,7 @@ supersetWebsockets:
   service:
     type: ClusterIP
     annotations: {}
+    loadBalancerIP: ~
     port: 8080
     nodePort:
       # -- (int)