diff --git a/stable/postgresql/Chart.yaml b/stable/postgresql/Chart.yaml
index 02579a76bb..36e7af2d9c 100644
--- a/stable/postgresql/Chart.yaml
+++ b/stable/postgresql/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: postgresql
-version: 6.5.8
+version: 6.5.9
 appVersion: 11.5.0
 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
 keywords:
diff --git a/stable/postgresql/values.schema.json b/stable/postgresql/values.schema.json
index 5f905e5de6..ac2de6e943 100644
--- a/stable/postgresql/values.schema.json
+++ b/stable/postgresql/values.schema.json
@@ -5,20 +5,20 @@
     "postgresqlUsername": {
       "type": "string",
       "title": "Admin user",
-      "form": "username"
+      "form": true
     },
     "postgresqlPassword": {
       "type": "string",
       "title": "Password",
-      "form": "password"
+      "form": true
     },
     "persistence": {
       "type": "object",
       "properties": {
         "size": {
           "type": "string",
-          "title": "Disk Size",
-          "form": "diskSize",
+          "title": "Persistent Volume Size",
+          "form": true,
           "render": "slider",
           "sliderMin": 1,
           "sliderMax": 100,
@@ -30,14 +30,14 @@
       "type": "object",
       "title": "Required Resources",
       "description": "Configure resource requests",
-      "form": "resources",
+      "form": true,
       "properties": {
         "requests": {
           "type": "object",
           "properties": {
             "memory": {
               "type": "string",
-              "form": "memoryRequest",
+              "form": true,
               "render": "slider",
               "title": "Memory Request",
               "sliderMin": 10,
@@ -46,7 +46,7 @@
             },
             "cpu": {
               "type": "string",
-              "form": "cpuRequest",
+              "form": true,
               "render": "slider",
               "title": "CPU Request",
               "sliderMin": 10,
@@ -59,19 +59,22 @@
     },
     "replication": {
       "type": "object",
-      "form": "replication",
+      "form": true,
       "title": "Replication Details",
       "properties": {
         "enabled": {
           "type": "boolean",
           "title": "Enable Replication",
-          "form": "enableReplication",
-          "enables": "replication"
+          "form": true
         },
         "slaveReplicas": {
           "type": "integer",
           "title": "Slave Replicas",
-          "form": "slaveReplicas"
+          "form": true,
+          "hidden": {
+            "condition": false,
+            "value": "replication.enabled"
+          }
         }
       }
     },
@@ -80,7 +83,7 @@
       "properties": {
         "enabled": {
           "type": "boolean",
-          "form": "enableVolumePermissions",
+          "form": true,
           "title": "Enable Init Containers",
           "description": "Change the owner of the persist volume mountpoint to RunAsUser:fsGroup"
         }
@@ -92,7 +95,7 @@
         "enabled": {
           "type": "boolean",
           "title": "Configure metrics exporter",
-          "form": "enableMetrics"
+          "form": true
         }
       }
     }