diff --git a/share/dataset-pg/databases.tf b/share/dataset-pg/databases.tf
index 60d0746..236bf5d 100644
--- a/share/dataset-pg/databases.tf
+++ b/share/dataset-pg/databases.tf
@@ -8,7 +8,7 @@ data "kubernetes_secret_v1" "postgresql_password" {
 locals {
   pg-username = data.kubernetes_secret_v1.postgresql_password.data["username"]
   pg-password = data.kubernetes_secret_v1.postgresql_password.data["password"]
-  pg-host = "${var.db-source.name}-pg-rw.${var.db-source.namespace}.svc"
+  pg-host = "${var.instance}-${var.component}-rw.${var.namespace}.svc"
 
   sorted-db-name = reverse(distinct(sort([
     for db in var.databases: db.name
diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml
index ddf9538..3616a22 100644
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -6,6 +6,28 @@ metadata:
   name: dataset-pg
   description: null
 options:
+  storage:
+    default: 8Gi
+    examples:
+    - 8Gi
+    type: string
+  extentions:
+    default:
+      pool:
+        enable: false
+    examples:
+    - pool:
+        enable: false
+    properties:
+      pool:
+        default:
+          enable: false
+        properties:
+          enable:
+            default: false
+            type: boolean
+        type: object
+    type: object
   backups:
     default:
       enable: false
@@ -60,33 +82,6 @@ options:
         default: backup-settings
         type: string
     type: object
-  roles:
-    default: []
-    items:
-      type: string
-    type: array
-  extentions:
-    default:
-      pool:
-        enable: false
-    examples:
-    - pool:
-        enable: false
-    properties:
-      pool:
-        default:
-          enable: false
-        properties:
-          enable:
-            default: false
-            type: boolean
-        type: object
-    type: object
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
   databases:
     default: []
     items:
@@ -96,11 +91,16 @@ options:
           type: string
       type: object
     type: array
-  storage:
-    default: 8Gi
+  replicas:
+    default: 1
     examples:
-    - 8Gi
-    type: string
+    - 1
+    type: integer
+  roles:
+    default: []
+    items:
+      type: string
+    type: array
 dependencies: []
 providers:
   kubernetes: true