diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml
index 0fbf259..cb2e1ce 100644
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -6,34 +6,11 @@ metadata:
   name: dataset-pg
   description: null
 options:
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
   storage:
     default: 8Gi
     examples:
     - 8Gi
     type: string
-  databases:
-    default: []
-    items:
-      properties:
-        name:
-          default: db
-          type: string
-      type: object
-    type: array
-  roles:
-    default: []
-    items:
-      properties:
-        name:
-          default: db
-          type: string
-      type: object
-    type: array
   backups:
     default:
       enable: false
@@ -88,6 +65,15 @@ options:
         default: backup-settings
         type: string
     type: object
+  roles:
+    default: []
+    items:
+      properties:
+        name:
+          default: alt-account
+          type: string
+      type: object
+    type: array
   extentions:
     default:
       pool:
@@ -105,6 +91,20 @@ options:
             type: boolean
         type: object
     type: object
+  databases:
+    default: []
+    items:
+      properties:
+        name:
+          default: db
+          type: string
+      type: object
+    type: array
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
 dependencies: []
 providers:
   kubernetes: true
diff --git a/share/dataset-pg/roles.tf b/share/dataset-pg/roles.tf
index d60a59c..f1becf0 100644
--- a/share/dataset-pg/roles.tf
+++ b/share/dataset-pg/roles.tf
@@ -1,5 +1,5 @@
 locals {
-  sorted-roles-name = reverse(distinct(sort(var.roles.name)))
+  sorted-roles-name = reverse(distinct(sort([for r in var.roles: r.name])))
   sorted-roles = flatten([
     for name in local.sorted-roles-name: [
       for r in var.roles: