diff --git a/apps/dbgate/configs.tf b/apps/dbgate/configs.tf
index 96fb028..190a503 100644
--- a/apps/dbgate/configs.tf
+++ b/apps/dbgate/configs.tf
@@ -75,15 +75,15 @@ resource "kubernetes_secret_v1" "dbgate-config-secret" {
 data "kubernetes_secret_v1" "pgs" {
   count             = length(var.pg)
   metadata {
-    name      = "${var.pgs[count.index].secret.name}"
-    namespace = "${var.pgs[count.index].namespace}"
+    name      = "${var.pg[count.index].secret.name}"
+    namespace = "${var.pg[count.index].namespace}"
   }
 }
 
 data "kubernetes_secret_v1" "mongos" {
   count             = length(var.mongo)
   metadata {
-    name      = "${var.pgs[count.index].secret.name}"
-    namespace = "${var.pgs[count.index].namespace}"
+    name      = "${var.mongo[count.index].secret.name}"
+    namespace = "${var.mongo[count.index].namespace}"
   }
 }
diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml
index 34364f3..c7e0802 100644
--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -11,6 +11,11 @@ options:
     examples:
     - dbgate
     type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   images:
     default:
       dbgate:
@@ -50,39 +55,17 @@ options:
             type: string
         type: object
     type: object
-  domain-name:
-    default: your_company.com
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - your_company.com
+    - letsencrypt-prod
     type: string
-  storage:
-    default:
-      accessMode: ReadWriteOnce
-      size: 1Gi
-      type: Filesystem
+  app-group:
+    default: dev
     examples:
-    - accessMode: ReadWriteOnce
-      size: 1Gi
-      type: Filesystem
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 1Gi
-        type: string
-      type:
-        default: Filesystem
-        enum:
-        - Filesystem
-        - Block
-        type: string
-    type: object
-  maria:
+    - dev
+    type: string
+  pg:
     default: []
     examples:
     - []
@@ -111,15 +94,10 @@ options:
           type: string
       type: object
     type: array
-  ingress-class:
-    default: traefik
+  domain-name:
+    default: your_company.com
     examples:
-    - traefik
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
+    - your_company.com
     type: string
   mongo:
     default: []
@@ -150,17 +128,39 @@ options:
           type: string
       type: object
     type: array
-  app-group:
-    default: dev
+  storage:
+    default:
+      accessMode: ReadWriteOnce
+      size: 1Gi
+      type: Filesystem
     examples:
-    - dev
-    type: string
-  issuer:
-    default: letsencrypt-prod
+    - accessMode: ReadWriteOnce
+      size: 1Gi
+      type: Filesystem
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 1Gi
+        type: string
+      type:
+        default: Filesystem
+        enum:
+        - Filesystem
+        - Block
+        type: string
+    type: object
+  ingress-class:
+    default: traefik
     examples:
-    - letsencrypt-prod
+    - traefik
     type: string
-  pg:
+  maria:
     default: []
     examples:
     - []