diff --git a/apps/dbgate/configs.tf b/apps/dbgate/configs.tf
index d10099b..8fa749c 100644
--- a/apps/dbgate/configs.tf
+++ b/apps/dbgate/configs.tf
@@ -8,7 +8,7 @@ locals {
     join("_",["USER_pg", pg.namespace, pg.name, pg.dbname]) = pg.username
   }]...)
   pg_secrets = merge([for index, pg in var.pg: {
-    join("_",["PASSWORD_pg", pg.namespace, pg.name, pg.dbname]) = data.kubernetes_secret_v1.pgs[index].data[pg.secret.key]
+    join("_",["PASSWORD_pg", pg.namespace, pg.name, pg.dbname]) = lookup(data.kubernetes_secret_v1.pgs[index].data, lookup(pg.secret,"key", "password"), "not-found")
   }]...)
   pg_conns = [for pg in var.pg: join("_",["pg", pg.namespace, pg.name, pg.dbname])]
 
diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml
index 0f9bdf8..18cea44 100644
--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -6,35 +6,6 @@ metadata:
   name: dbgate
   description: null
 options:
-  pg:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        dbname:
-          default: ''
-          type: string
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-        secret:
-          properties:
-            key:
-              default: ''
-              type: string
-            name:
-              default: ''
-              type: string
-          type: object
-        username:
-          default: ''
-          type: string
-      type: object
-    type: array
   images:
     default:
       dbgate:
@@ -74,10 +45,24 @@ options:
             type: string
         type: object
     type: object
-  issuer:
-    default: letsencrypt-prod
+  redis:
+    default: []
     examples:
-    - letsencrypt-prod
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+      type: object
+    type: array
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
     type: string
   storage:
     default:
@@ -106,6 +91,31 @@ options:
         - Block
         type: string
     type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  sub-domain:
+    default: dbgate
+    examples:
+    - dbgate
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   maria:
     default: []
     examples:
@@ -135,11 +145,6 @@ options:
           type: string
       type: object
     type: array
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
   mongo:
     default: []
     examples:
@@ -169,40 +174,35 @@ options:
           type: string
       type: object
     type: array
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  redis:
+  pg:
     default: []
     examples:
     - []
     items:
       properties:
+        dbname:
+          default: ''
+          type: string
         name:
           default: ''
           type: string
         namespace:
           default: ''
           type: string
+        secret:
+          properties:
+            key:
+              default: ''
+              type: string
+            name:
+              default: ''
+              type: string
+          type: object
+        username:
+          default: ''
+          type: string
       type: object
     type: array
-  sub-domain:
-    default: dbgate
-    examples:
-    - dbgate
-    type: string
 dependencies:
 - dist: null
   category: share