diff --git a/apps/dbgate/configs.tf b/apps/dbgate/configs.tf
index da957d2..be6273e 100644
--- a/apps/dbgate/configs.tf
+++ b/apps/dbgate/configs.tf
@@ -59,7 +59,7 @@ resource "kubectl_manifest" "dbgate-config" {
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
       labels: ${jsonencode(local.common-labels)}
-    data: ${jsonencode(merge(local.oauth_config, local.connection_vars))}
+    data: ${jsonencode(var.use-oauth?merge(local.oauth_config, local.connection_vars):local.connection_vars)}
   EOF
 }
 
diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml
index 4ee545a..dd6ca44 100644
--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -6,60 +6,11 @@ metadata:
   name: dbgate
   description: null
 options:
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  sub-domain:
-    default: dbgate
-    examples:
-    - dbgate
-    type: string
-  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
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
   maria:
     default: []
     examples:
@@ -89,35 +40,6 @@ options:
           type: string
       type: object
     type: array
-  mongo:
-    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
   use-oauth:
     default: false
     examples:
@@ -162,6 +84,31 @@ options:
             type: string
         type: object
     type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  sub-domain:
+    default: dbgate
+    examples:
+    - dbgate
+    type: string
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
   storage:
     default:
       accessMode: ReadWriteOnce
@@ -189,11 +136,64 @@ options:
         - Block
         type: string
     type: object
-  domain-name:
-    default: your_company.com
+  pg:
+    default: []
     examples:
-    - your_company.com
-    type: string
+    - []
+    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
+  mongo:
+    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
 dependencies:
 - dist: null
   category: share