diff --git a/README.md b/README.md
index 8987208..84b55bd 100644
--- a/README.md
+++ b/README.md
@@ -8,28 +8,71 @@ Implements Server Manager capabilities (including web-ui/auth) in kubernetes
 
 ```yaml
 email:
-    from": ""
-    username":  ""
-    password":  ""
-    server":    ""
+  from_email: ""
+  username: ""
+  password: ""
+  server: ""
 
-servers_database:
-    type: "" # mongo / kubernetes
-    mongo:
-        uesrname: ""
-        password: ""
-        url: ""
-
-users_database:
-    type: "" # mongo / ...
-    mongo:
-        username: ""
-        password: ""
-        url: ""
+domain: ""
 
 signing:
-    algorithm": "HS512"
-    key: ""
+  key: ""
+  algorithm: "HS512"
 
-domain: "games.acooldomain.co"
+authentication:
+  type: "OIDC"  # OIDC or UserPass
+  oidc:
+    issuer_url: ""
+    client_id: ""
+    client_secret: ""
+  user_pass:
+    type: "mongo"
+    mongo:
+      url: ""
+      username: ""
+      password: ""
+      database: ""
+      collection: ""
+    invite_token_database:
+      type: "mongo"
+      mongo:
+        url: ""
+        username: ""
+        password: ""
+        database: ""
+        collection: ""
+
+instancemanager:
+  type: "docker"  # or kubernetes
+  docker:
+    games_domain: ""
+    browsers_domain: ""
+    certificate_resolver: ""
+    file_browser:
+      image:
+        registry: ""
+        tag: ""
+      command: ""
+      network: ""
+
+users:
+  default_max_owned_servers: 10
+
+servers_database:
+  type: "mongo"
+  mongo:
+    url: ""
+    username: ""
+    password: ""
+    database: ""
+    collection: ""
+
+servers_authorization_database:
+  type: "mongo"
+  mongo:
+    url: ""
+    username: ""
+    password: ""
+    database: ""
+    collection: ""
 ```
diff --git a/config.yaml b/config.yaml
index 934c4ec..787c46c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,30 +1,69 @@
 email:
-    from": ""
-    username":  ""
-    password":  ""
-    server":    ""
+  from_email: ""
+  username: ""
+  password: ""
+  server: ""
 
-servers_database:
-    type: "" # mongo / kubernetes
-    mongo:
-        uesrname: ""
-        password: ""
-        url: ""
-
-users_database:
-    type: "" # mongo / oidc ...
-    mongo:
-        username: ""
-        password: ""
-        url: ""
-
-    oauth:
-        client_id: ""
-        client_secret: ""
-        discovery_url: ""
+domain: ""
 
 signing:
-    algorithm": "HS512"
-    key: ""
+  key: ""
+  algorithm: "HS512"
+
+authentication:
+  type: "OIDC"  # OIDC or UserPass
+  oidc:
+    issuer_url: ""
+    client_id: ""
+    client_secret: ""
+  user_pass:
+    type: "mongo"
+    mongo:
+      url: ""
+      username: ""
+      password: ""
+      database: ""
+      collection: ""
+    invite_token_database:
+      type: "mongo"
+      mongo:
+        url: ""
+        username: ""
+        password: ""
+        database: ""
+        collection: ""
+
+instancemanager:
+  type: "docker"  # or kubernetes
+  docker:
+    games_domain: ""
+    browsers_domain: ""
+    certificate_resolver: ""
+    file_browser:
+      image:
+        registry: ""
+        tag: ""
+      command: ""
+      network: ""
+
+users:
+  default_max_owned_servers: 10
+
+servers_database:
+  type: "mongo"
+  mongo:
+    url: ""
+    username: ""
+    password: ""
+    database: ""
+    collection: ""
+
+servers_authorization_database:
+  type: "mongo"
+  mongo:
+    url: ""
+    username: ""
+    password: ""
+    database: ""
+    collection: ""
 
-domain: "games.acooldomain.co"