diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 2ac78630149b5..8d93ab473195b 100644
--- a/helm/superset/Chart.yaml
+++ b/helm/superset/Chart.yaml
@@ -22,7 +22,7 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.6.0
+version: 0.6.1
 dependencies:
 - name: postgresql
   version: 11.1.22
diff --git a/helm/superset/values.schema.json b/helm/superset/values.schema.json
index 2273718d7b34a..5e419d35a67d7 100644
--- a/helm/superset/values.schema.json
+++ b/helm/superset/values.schema.json
@@ -413,73 +413,63 @@
         },
         "postgresql": {
             "type": "object",
-            "additionalProperties": true,
             "properties": {
-                "enabled": {
-                    "type": "boolean"
-                },
-                "existingSecret": {
-                    "type": [
-                        "string",
-                        "null"
-                    ]
-                },
-                "existingSecretKey": {
-                    "type": [
-                        "string",
-                        "null"
-                    ]
-                },
-                "service": {
+                "auth": {
                     "type": "object",
-                    "additionalProperties": true,
                     "properties": {
-                        "port": {
-                            "type": "integer"
+                        "database": {
+                            "type": "string"
+                        },
+                        "existingSecret": {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                        },
+                        "password": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
                         }
-                    },
-                    "required": [
-                        "port"
-                    ]
-                },
-                "postgresqlUsername": {
-                    "type": "string"
-                },
-                "postgresqlPassword": {
-                    "type": "string"
+                    }
                 },
-                "postgresqlDatabase": {
-                    "type": "string"
+                "enabled": {
+                    "type": "boolean"
                 },
-                "persistence": {
+                "primary": {
                     "type": "object",
-                    "additionalProperties": true,
                     "properties": {
-                        "enabled": {
-                            "type": "boolean"
+                        "persistence": {
+                            "type": "object",
+                            "properties": {
+                                "accessModes": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                },
+                                "enabled": {
+                                    "type": "boolean"
+                                }
+                            }
                         },
-                        "accessModes": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
+                        "service": {
+                            "type": "object",
+                            "properties": {
+                                "ports": {
+                                    "type": "object",
+                                    "properties": {
+                                        "postgresql": {
+                                            "type": "string"
+                                        }
+                                    }
                                 }
-                            ]
+                            }
                         }
-                    },
-                    "required": [
-                        "enabled",
-                        "accessModes"
-                    ]
+                    }
                 }
-            },
-            "required": [
-                "enabled",
-                "service",
-                "postgresqlUsername",
-                "postgresqlDatabase",
-                "persistence"
-            ]
+            }
         },
         "redis": {
             "type": "object",
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index ea8472ebc31da..2adc6bf662944 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -370,42 +370,39 @@ postgresql:
   ## Use the PostgreSQL chart dependency.
   ## Set to false if bringing your own PostgreSQL.
   enabled: true
-  ##
-  ## The name of an existing secret that contains the postgres password.
-  existingSecret:
-  ## Name of the key containing the secret.
-  existingSecretKey: postgresql-password
-  ##
-  ## If you are bringing your own PostgreSQL, you should set postgresHost and
-  ## also probably service.port, postgresqlUsername, postgresqlPassword, and postgresqlDatabase
-  ## postgresHost:
-  ##
-  ## PostgreSQL port
-  service:
-    port: 5432
-  ## PostgreSQL User to create.
-  postgresqlUsername: superset
-  ##
-  ## PostgreSQL Password for the new user.
-  ## If not set, a random 10 characters password will be used.
-  postgresqlPassword: superset
-  ##
-  ## PostgreSQL Database to create.
-  postgresqlDatabase: superset
-  ##
-  ## Persistent Volume Storage configuration.
-  ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes
-  persistence:
-    ##
-    ## Enable PostgreSQL persistence using Persistent Volume Claims.
-    enabled: true
-    ##
-    ## Persistant class
-    # storageClass: classname
+
+  ## Authentication parameters
+  auth:
+    ## The name of an existing secret that contains the postgres password.
+    existingSecret:
+    ## PostgreSQL name for a custom user to create
+    username: superset
+    ## PostgreSQL password for the custom user to create. Ignored if `auth.existingSecret` with key `password` is provided
+    password: superset
+    ## PostgreSQL name for a custom database to create
+    database: superset
+
+
+  ## PostgreSQL Primary parameters
+  primary:
     ##
-    ## Access modes:
-    accessModes:
-      - ReadWriteOnce
+    ## Persistent Volume Storage configuration.
+    ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes
+    persistence:
+      ##
+      ## Enable PostgreSQL persistence using Persistent Volume Claims.
+      enabled: true
+      ##
+      ## Persistant class
+      # storageClass: classname
+      ##
+      ## Access modes:
+      accessModes:
+        - ReadWriteOnce
+    ## PostgreSQL port
+    service:
+      ports:
+        postgresql: "5432"
 
 ## Configuration values for the Redis dependency.
 ## ref: https://github.com/bitnami/charts/blob/master/bitnami/redis