diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml
index 43bccbf..77a6873 100644
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -11,10 +11,64 @@ options:
     examples:
     - letsencrypt-prod
     type: string
-  ingress-class:
-    default: traefik
+  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:
-    - traefik
+    - 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
+  sub-domain:
+    default: dataset-pg
+    examples:
+    - dataset-pg
     type: string
   storage:
     default: 8Gi
@@ -26,6 +80,34 @@ options:
     examples:
     - 1
     type: integer
+  databases:
+    default: []
+    items:
+      properties:
+        name:
+          default: db
+          type: string
+      type: object
+    type: array
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  roles:
+    default: []
+    items:
+      properties:
+        name:
+          default: alt-account
+          type: string
+      type: object
+    type: array
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   extentions:
     default:
       pool:
@@ -132,88 +214,6 @@ options:
             type: object
         type: object
     type: object
-  roles:
-    default: []
-    items:
-      properties:
-        name:
-          default: alt-account
-          type: string
-      type: object
-    type: array
-  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:
-    - 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
-  databases:
-    default: []
-    items:
-      properties:
-        name:
-          default: db
-          type: string
-      type: object
-    type: array
-  sub-domain:
-    default: dataset-pg
-    examples:
-    - dataset-pg
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/dataset-pg/roles.tf b/share/dataset-pg/roles.tf
index f26af2c..65b7a09 100644
--- a/share/dataset-pg/roles.tf
+++ b/share/dataset-pg/roles.tf
@@ -41,7 +41,7 @@ data "kubernetes_secret_v1" "password_role_get" {
 }
 
 resource "postgresql_role" "role" {
-  depends_on        = [ kubectl_manifest.prj_pg ]
+  depends_on        = [ time_sleep.wait_pg_ready ]
   count             = length(local.sorted-roles)
   name              = "${local.sorted-roles[count.index].name}"
   login             = true
@@ -49,6 +49,7 @@ resource "postgresql_role" "role" {
 }
 
 resource "postgresql_grant_role" "anomynous" {
+  depends_on        = [ postgresql_role.role ]
   count             = var.extentions.postgrest.enable?1:0
   role              = "${var.instance}"
   grant_role        = "anomynous"