diff --git a/templates/questions/postgresql/postgresql.yaml b/templates/questions/postgresql/postgresql.yaml
index 41798d76b23..150abf3cb32 100644
--- a/templates/questions/postgresql/postgresql.yaml
+++ b/templates/questions/postgresql/postgresql.yaml
@@ -101,154 +101,6 @@
                       schema:
                         type: boolean
                         default: false
-              - variable: recovery
-                label: "Recovery Settings (Experimental)"
-                schema:
-                  additional_attrs: true
-                  type: dict
-                  attrs:
-                    - variable: enabled
-                      label: "enabled"
-                      schema:
-                        type: boolean
-                        default: false
-                    - variable: endpointURL
-                      label: "endpointURL"
-                      schema:
-                        type: string
-                        show_if: [["enabled", "=", true]]
-                        default: ""
-                    - variable: method
-                      label: "method"
-                      schema:
-                        type: string
-                        show_if: [["enabled", "=", true]]
-                        default: "object_store"
-                    - variable: backupName
-                      label: "backupName"
-                      schema:
-                        type: string
-                        show_if: [["enabled", "=", true]]
-                        default: ""
-                    - variable: provider
-                      label: "provider"
-                      schema:
-                        type: string
-                        show_if: [["enabled", "=", true]]
-                        default: "s3"
-                        enum:
-                         - value: s3
-                           description: S3
-                         - value: azure
-                           description: Azure
-                         - value: google
-                           description: Google
-                    - variable: s3
-                      label: "s3"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        show_if: [["provider", "=", "s3"]]
-                        attrs:
-                          - variable: region
-                            label: "region"
-                            schema:
-                              type: string
-                              default: ""
-                          - variable: bucket
-                            label: "bucket"
-                            schema:
-                              type: string
-                              default: ""
-                          - variable: path
-                            label: "path"
-                            schema:
-                              type: string
-                              default: "/"
-                          - variable: accessKey
-                            label: "accessKey"
-                            schema:
-                              type: string
-                              default: ""
-                          - variable: secretKey
-                            label: "secretKey"
-                            schema:
-                              type: string
-                              default: ""
-                    - variable: azure
-                      label: "azure (EXTREMELY EXPERIMENTAL)"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        show_if: [["provider", "=", "azure"]]
-                        attrs:
-                          - variable: path
-                            label: "path"
-                            schema:
-                              type: string
-                              default: "/"
-                          - variable: connectionString
-                            label: "connectionString"
-                            schema:
-                              type: string
-                              default: ""
-                          - variable: storageAccount
-                            label: "storageAccount"
-                            schema:
-                              type: string
-                              default: ""
-                          - variable: storageKey
-                            label: "storageKey"
-                            schema:
-                              type: string
-                              default: ""
-                          - variable: storageSasToken
-                            label: "storageSasToken"
-                            schema:
-                              type: string
-                              default: ""
-                          - variable: containerName
-                            label: "containerName"
-                            schema:
-                              type: string
-                              default: ""
-                          - variable: serviceName
-                            label: "serviceName"
-                            schema:
-                              type: string
-                              default: "blob"
-                          - variable: inheritFromAzureAD
-                            label: "inheritFromAzureAD"
-                            schema:
-                              type: boolean
-                              default: false
-                    - variable: google
-                      label: "google (EXTREMELY EXPERIMENTAL)"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        show_if: [["provider", "=", "google"]]
-                        attrs:
-                          - variable: path
-                            label: "path"
-                            schema:
-                              type: string
-                              default: "/"
-                          - variable: bucket
-                            label: "bucket"
-                            schema:
-                              type: string
-                              default: ""
-                          - variable: gkeEnvironment
-                            label: "gkeEnvironment"
-                            schema:
-                              type: string
-                              default: ""
-                          - variable: applicationCredentials
-                            label: "applicationCredentials"
-                            schema:
-                              type: string
-                              default: ""
               - variable: backups
                 label: "Backup Settings (Experimental)"
                 schema:
@@ -260,6 +112,15 @@
                       schema:
                         type: boolean
                         default: false
+                    - variable: serverName
+                      label: "serverName"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: revision
+                      label: "serverName"
+                      schema:
+                        type: int
                     - variable: endpointURL
                       label: "endpointURL"
                       schema:
@@ -398,63 +259,161 @@
                             schema:
                               type: string
                               default: ""
-                    - variable: scheduledBackups
-                      label: ScheduledBackups
+              - variable: recovery
+                label: "Recovery Settings (Experimental)"
+                schema:
+                  additional_attrs: true
+                  type: dict
+                  attrs:
+                    - variable: enabled
+                      label: "enabled"
                       schema:
-                        type: list
-                        default: []
-                        show_if: [["enabled", "=", true]]
-                        items:
-                          - variable: backupschedule
-                            label: BackupSchedule
-                            schema:
-                              additional_attrs: true
-                              type: dict
-                              attrs:
-                                - variable: name
-                                  label: name
-                                  schema:
-                                    type: string
-                                    default: "daily-backup"
-                                    required: true
-                                - variable: schedule
-                                  label: schedule
-                                  schema:
-                                    type: string
-                                    required: true
-                                    default: "0 0 0 * * *"
-                                - variable: backupOwnerReference
-                                  label: backupOwnerReference
-                                  schema:
-                                    type: string
-                                    required: true
-                                    default: "self"
-                                - variable: immediate
-                                  label: immediate
-                                  schema:
-                                    type: boolean
-                                    default: false
-                                - variable: suspend
-                                  label: suspend
-                                  schema:
-                                    type: boolean
-                                    default: false
-                    - variable: manualBackups
-                      label: manualBackups
+                        type: boolean
+                        default: false
+                    - variable: serverName
+                      label: "serverName"
                       schema:
-                        type: list
-                        default: []
+                        type: string
+                        default: ""
+                    - variable: revision
+                      label: "serverName"
+                      schema:
+                        type: int
+                    - variable: endpointURL
+                      label: "endpointURL"
+                      schema:
+                        type: string
                         show_if: [["enabled", "=", true]]
-                        items:
-                          - variable: backup
-                            label: Backup
+                        default: ""
+                    - variable: method
+                      label: "method"
+                      schema:
+                        type: string
+                        show_if: [["enabled", "=", true]]
+                        default: "object_store"
+                    - variable: backupName
+                      label: "backupName"
+                      schema:
+                        type: string
+                        show_if: [["enabled", "=", true]]
+                        default: ""
+                    - variable: provider
+                      label: "provider"
+                      schema:
+                        type: string
+                        show_if: [["enabled", "=", true]]
+                        default: "s3"
+                        enum:
+                         - value: s3
+                           description: S3
+                         - value: azure
+                           description: Azure
+                         - value: google
+                           description: Google
+                    - variable: s3
+                      label: "s3"
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        show_if: [["provider", "=", "s3"]]
+                        attrs:
+                          - variable: region
+                            label: "region"
                             schema:
-                              additional_attrs: true
-                              type: dict
-                              attrs:
-                                - variable: name
-                                  label: name
-                                  schema:
-                                    type: string
-                                    default: ""
-                                    required: true
+                              type: string
+                              default: ""
+                          - variable: bucket
+                            label: "bucket"
+                            schema:
+                              type: string
+                              default: ""
+                          - variable: path
+                            label: "path"
+                            schema:
+                              type: string
+                              default: "/"
+                          - variable: accessKey
+                            label: "accessKey"
+                            schema:
+                              type: string
+                              default: ""
+                          - variable: secretKey
+                            label: "secretKey"
+                            schema:
+                              type: string
+                              default: ""
+                    - variable: azure
+                      label: "azure (EXTREMELY EXPERIMENTAL)"
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        show_if: [["provider", "=", "azure"]]
+                        attrs:
+                          - variable: path
+                            label: "path"
+                            schema:
+                              type: string
+                              default: "/"
+                          - variable: connectionString
+                            label: "connectionString"
+                            schema:
+                              type: string
+                              default: ""
+                          - variable: storageAccount
+                            label: "storageAccount"
+                            schema:
+                              type: string
+                              default: ""
+                          - variable: storageKey
+                            label: "storageKey"
+                            schema:
+                              type: string
+                              default: ""
+                          - variable: storageSasToken
+                            label: "storageSasToken"
+                            schema:
+                              type: string
+                              default: ""
+                          - variable: containerName
+                            label: "containerName"
+                            schema:
+                              type: string
+                              default: ""
+                          - variable: serviceName
+                            label: "serviceName"
+                            schema:
+                              type: string
+                              default: "blob"
+                          - variable: inheritFromAzureAD
+                            label: "inheritFromAzureAD"
+                            schema:
+                              type: boolean
+                              default: false
+                    - variable: google
+                      label: "google (EXTREMELY EXPERIMENTAL)"
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        show_if: [["provider", "=", "google"]]
+                        attrs:
+                          - variable: path
+                            label: "path"
+                            schema:
+                              type: string
+                              default: "/"
+                          - variable: bucket
+                            label: "bucket"
+                            schema:
+                              type: string
+                              default: ""
+                          - variable: gkeEnvironment
+                            label: "gkeEnvironment"
+                            schema:
+                              type: string
+                              default: ""
+                          - variable: applicationCredentials
+                            label: "applicationCredentials"
+                            schema:
+                              type: string
+                              default: ""
+