diff --git a/share/dataset-pg/databases.tf b/share/dataset-pg/databases.tf
index 454d116..7246d66 100644
--- a/share/dataset-pg/databases.tf
+++ b/share/dataset-pg/databases.tf
@@ -62,7 +62,7 @@ data "kubernetes_secret_v1" "password_get" {
 }
 
 resource "postgresql_role" "owner" {
-  depends_on        = [ time_sleep.wait_pg_ready ]
+  depends_on        = [ time_sleep.wait_pg_ready, kubectl_manifest.prj_pg, data.kubernetes_secret_v1.postgresql_password ]
   count             = length(local.sorted-dbs)
   name              = "${local.sorted-dbs[count.index].name}"
   login             = true
diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml
index d1c7df6..71827b8 100644
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -6,35 +6,41 @@ metadata:
   name: dataset-pg
   description: null
 options:
-  images:
-    default:
-      postgresql:
-        registry: ghcr.io
-        repository: cloudnative-pg/postgresql
-        tag: 15.3
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - postgresql:
-        registry: ghcr.io
-        repository: cloudnative-pg/postgresql
-        tag: 15.3
+    - letsencrypt-prod
+    type: string
+  postgres:
+    default:
+      replicas: 1
+    examples:
+    - replicas: 1
     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
+      replicas:
+        default: 1
+        type: integer
     type: object
+  sub-domain:
+    default: dataset-pg
+    examples:
+    - dataset-pg
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  app_group:
+    default: api
+    examples:
+    - api
+    type: string
   backups:
     default:
       enable: false
@@ -89,36 +95,15 @@ options:
         default: backup-settings
         type: string
     type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  sub-domain:
-    default: dataset-pg
-    examples:
-    - dataset-pg
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
+  roles:
+    default: []
+    items:
+      properties:
+        name:
+          default: alt-account
+          type: string
+      type: object
+    type: array
   storage:
     default:
       postgres:
@@ -136,16 +121,6 @@ options:
             type: string
         type: object
     type: object
-  app_group:
-    default: api
-    examples:
-    - api
-    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   extentions:
     default:
       directus:
@@ -327,6 +302,40 @@ options:
             type: object
         type: object
     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
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   databases:
     default: []
     items:
@@ -336,15 +345,6 @@ options:
           type: string
       type: object
     type: array
-  roles:
-    default: []
-    items:
-      properties:
-        name:
-          default: alt-account
-          type: string
-      type: object
-    type: array
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/dataset-pg/roles.tf b/share/dataset-pg/roles.tf
index fdb8729..dbf0657 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        = [ time_sleep.wait_pg_ready ]
+  depends_on        = [ time_sleep.wait_pg_ready, kubectl_manifest.prj_pg, data.kubernetes_secret_v1.postgresql_password ]
   count             = length(local.sorted-roles)
   name              = "${local.sorted-roles[count.index].name}"
   login             = true