diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml
index defce10..2f704b9 100644
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -6,20 +6,118 @@ metadata:
   name: dataset-pg
   description: null
 options:
-  app_group:
-    default: api
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key_id_key: s3-id
+      retention:
+        db: 30d
+      schedule:
+        db: 0 3 * * *
+      secret_key: s3-secret
+      secret_name: backup-settings
     examples:
-    - api
+    - enable: false
+      endpoint: ''
+      key_id_key: s3-id
+      retention:
+        db: 30d
+      schedule:
+        db: 0 3 * * *
+      secret_key: s3-secret
+      secret_name: backup-settings
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key_id_key:
+        default: s3-id
+        type: string
+      retention:
+        default:
+          db: 30d
+        properties:
+          db:
+            default: 30d
+            type: string
+        type: object
+      schedule:
+        default:
+          db: 0 3 * * *
+        properties:
+          db:
+            default: 0 3 * * *
+            type: string
+        type: object
+      secret_key:
+        default: s3-secret
+        type: string
+      secret_name:
+        default: backup-settings
+        type: string
+    type: object
+  images:
+    default:
+      postgresql:
+        registry: ghcr.io
+        repository: cloudnative-pg/postgresql
+        tag: 15.3
+    examples:
+    - postgresql:
+        registry: ghcr.io
+        repository: cloudnative-pg/postgresql
+        tag: 15.3
+    properties:
+      postgresql:
+        default:
+          registry: ghcr.io
+          repository: cloudnative-pg/postgresql
+          tag: 15.3
+        properties:
+          registry:
+            default: ghcr.io
+            type: string
+          repository:
+            default: cloudnative-pg/postgresql
+            type: string
+          tag:
+            default: 15.3
+            type: number
+        type: object
+    type: object
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
     type: string
   ingress_class:
     default: traefik
     examples:
     - traefik
     type: string
-  domain:
-    default: your-company
+  postgres:
+    default:
+      replicas: 1
     examples:
-    - your-company
+    - replicas: 1
+    properties:
+      replicas:
+        default: 1
+        type: integer
+    type: object
+  sub_domain:
+    default: dataset-pg
+    examples:
+    - dataset-pg
     type: string
   extentions:
     default:
@@ -202,64 +300,10 @@ options:
             type: object
         type: object
     type: object
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key_id_key: s3-id
-      retention:
-        db: 30d
-      schedule:
-        db: 0 3 * * *
-      secret_key: s3-secret
-      secret_name: backup-settings
+  domain:
+    default: your-company
     examples:
-    - enable: false
-      endpoint: ''
-      key_id_key: s3-id
-      retention:
-        db: 30d
-      schedule:
-        db: 0 3 * * *
-      secret_key: s3-secret
-      secret_name: backup-settings
-    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key_id_key:
-        default: s3-id
-        type: string
-      retention:
-        default:
-          db: 30d
-        properties:
-          db:
-            default: 30d
-            type: string
-        type: object
-      schedule:
-        default:
-          db: 0 3 * * *
-        properties:
-          db:
-            default: 0 3 * * *
-            type: string
-        type: object
-      secret_key:
-        default: s3-secret
-        type: string
-      secret_name:
-        default: backup-settings
-        type: string
-    type: object
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
+    - your-company
     type: string
   databases:
     default: []
@@ -279,49 +323,10 @@ options:
           type: string
       type: object
     type: array
-  images:
-    default:
-      postgresql:
-        registry: ghcr.io
-        repository: cloudnative-pg/postgresql
-        tag: 15.3
+  app_group:
+    default: api
     examples:
-    - postgresql:
-        registry: ghcr.io
-        repository: cloudnative-pg/postgresql
-        tag: 15.3
-    properties:
-      postgresql:
-        default:
-          registry: ghcr.io
-          repository: cloudnative-pg/postgresql
-          tag: 15.3
-        properties:
-          registry:
-            default: ghcr.io
-            type: string
-          repository:
-            default: cloudnative-pg/postgresql
-            type: string
-          tag:
-            default: 15.3
-            type: number
-        type: object
-    type: object
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
+    - api
     type: string
   storage:
     default:
@@ -340,11 +345,6 @@ options:
             type: string
         type: object
     type: object
-  sub_domain:
-    default: dataset-pg
-    examples:
-    - dataset-pg
-    type: string
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/dataset-pg/postgresql.tf b/share/dataset-pg/postgresql.tf
index 4657029..06e4281 100644
--- a/share/dataset-pg/postgresql.tf
+++ b/share/dataset-pg/postgresql.tf
@@ -17,7 +17,7 @@ resource "kubectl_manifest" "prj_pg" {
       namespace: "${var.namespace}"
       labels: ${jsonencode(local.pg-labels)}
       annotations:
-        "k8up.io/backupcommand": "pg_dumpall -U postgres --clean"
+        "k8up.io/backupcommand": "pg_dumpall -U postgres -w --clean"
         "k8up.io/file-extension": ".sql"
     spec:
       instances: ${var.postgres.replicas}