diff --git a/docs/enterprise_edition/control_plane/.pages b/docs/enterprise_edition/control_plane/.pages
index 1697fd8d..3a498226 100644
--- a/docs/enterprise_edition/control_plane/.pages
+++ b/docs/enterprise_edition/control_plane/.pages
@@ -1,5 +1,4 @@
 nav:
   - index.md
   - installation.md
-  - features
   - ...
diff --git a/docs/enterprise_edition/control_plane/features/alerts.md b/docs/enterprise_edition/control_plane/alerts.md
similarity index 70%
rename from docs/enterprise_edition/control_plane/features/alerts.md
rename to docs/enterprise_edition/control_plane/alerts.md
index 7e61e886..a85698b1 100644
--- a/docs/enterprise_edition/control_plane/features/alerts.md
+++ b/docs/enterprise_edition/control_plane/alerts.md
@@ -4,7 +4,7 @@ icon: material/alert-circle-outline
 
 # Alerts
 
-Since the control plane has access to real-time PgDog [metrics](../../../features/metrics.md), it can detect outliers and trigger automatic alerts.
+Since the control plane has access to real-time PgDog [metrics](../../features/metrics.md), it can detect outliers and trigger automatic alerts.
 
 ## How it works
 
@@ -27,19 +27,34 @@ The following incident management providers are supported:
 
 Alerts are **disabled** by default. To enable them, configure a provider's API key and set thresholds for each supported metric you would like to monitor:
 
-```yaml title="values.yaml"
-control:
-  config:
-    alerts:
-      evaluation_window_secs: 300
-      thresholds:
-        clients_waiting: 10
-        cpu: 90.0
-        memory: 2048
-        server_connections: 100
-      incident_io:
-        api_key: inc_live_xxx
-```
+=== "Helm chart"
+    ```yaml title="values.yaml"
+    control:
+      config:
+        alerts:
+          evaluation_window_secs: 300
+          thresholds:
+            clients_waiting: 10
+            cpu: 90.0
+            memory: 2048
+            server_connections: 100
+          incident_io:
+            api_key: inc_live_xxx
+    ```
+=== "control.toml"
+    ```toml
+    [alerts]
+    evaluation_window_secs = 300
+
+    [alerts.thresholds]
+    clients_waiting = 10
+    cpu = 90.0
+    memory = 2048
+    server_connections = 100
+
+    [alerts.incident_io]
+    api_key = "inc_live_xxx"
+    ```
 
 #### Parameters
 
@@ -47,7 +62,7 @@ control:
     Thresholds have no defaults. If a threshold is not configured, its metric will not be monitored.
 
 
-The following parameters are configurable via the [Helm chart](../installation.md):
+The following parameters are configurable via the [Helm chart](installation.md):
 
 | Parameter | Description | Unit |
 |-|-|-|
diff --git a/docs/enterprise_edition/control_plane/features/autoscaling.md b/docs/enterprise_edition/control_plane/autoscaling.md
similarity index 61%
rename from docs/enterprise_edition/control_plane/features/autoscaling.md
rename to docs/enterprise_edition/control_plane/autoscaling.md
index 85ac8906..cabff642 100644
--- a/docs/enterprise_edition/control_plane/features/autoscaling.md
+++ b/docs/enterprise_edition/control_plane/autoscaling.md
@@ -8,18 +8,24 @@ Autoscaling automatically adjusts PgDog settings when the number of processes (e
 
 ## Configuration
 
-Autoscaling is **disabled** by default. To enable it, add the following settings to the [control plane](../installation.md) Helm [chart](https://github.com/pgdogdev/helm-ee):
-
-```yaml title="values.yaml"
-control:
-  config:
-    autoscaling:
-      pool_size: true
-```
+Autoscaling is **disabled** by default. To enable it, add the following settings to the [control plane](installation.md) Helm [chart](https://github.com/pgdogdev/helm-ee):
+
+=== "Helm chart"
+    ```yaml title="values.yaml"
+    control:
+      config:
+        autoscaling:
+          pool_size: true
+    ```
+=== "control.toml"
+    ```toml
+    [autoscaling]
+    pool_size = true
+    ```
 
 ## How it works
 
-When a PgDog process connects to the [control plane](../../control_plane/index.md), the control plane provides it with the total number of processes that are part of the same deployment. PgDog then automatically adjusts its configuration by dividing all pool-related configuration values by that number, for example:
+When a PgDog process connects to the [control plane](index.md), the control plane provides it with the total number of processes that are part of the same deployment. PgDog then automatically adjusts its configuration by dividing all pool-related configuration values by that number, for example:
 
 === "Configuration"
     ```toml title="pgdog.toml"
@@ -99,12 +105,12 @@ The following configuration options are supported for pool size autoscaling:
 
 | Section | Configuration |
 |-|-|
-| [`[general]`](../../../configuration/pgdog.toml/general.md) | [`default_pool_size`](../../../configuration/pgdog.toml/general.md#default_pool_size) (alias: `max_pool_size`) |
-| [`[general]`](../../../configuration/pgdog.toml/general.md) | [`min_pool_size`](../../../configuration/pgdog.toml/general.md#min_pool_size) |
-| [`[[databases]]`](../../../configuration/pgdog.toml/databases.md) | [`pool_size`](../../../configuration/pgdog.toml/databases.md#pool_size) |
-| [`[[databases]]`](../../../configuration/pgdog.toml/databases.md) | [`min_pool_size`](../../../configuration/pgdog.toml/databases.md#min_pool_size) |
-| [`[[users]]`](../../../configuration/users.toml/users.md) | [`pool_size`](../../../configuration/users.toml/users.md#pool_size) |
-| [`[[users]]`](../../../configuration/users.toml/users.md) | [`min_pool_size`](../../../configuration/users.toml/users.md#min_pool_size) |
+| [`[general]`](../../configuration/pgdog.toml/general.md) | [`default_pool_size`](../../configuration/pgdog.toml/general.md#default_pool_size) (alias: `max_pool_size`) |
+| [`[general]`](../../configuration/pgdog.toml/general.md) | [`min_pool_size`](../../configuration/pgdog.toml/general.md#min_pool_size) |
+| [`[[databases]]`](../../configuration/pgdog.toml/databases.md) | [`pool_size`](../../configuration/pgdog.toml/databases.md#pool_size) |
+| [`[[databases]]`](../../configuration/pgdog.toml/databases.md) | [`min_pool_size`](../../configuration/pgdog.toml/databases.md#min_pool_size) |
+| [`[[users]]`](../../configuration/users.toml/users.md) | [`pool_size`](../../configuration/users.toml/users.md#pool_size) |
+| [`[[users]]`](../../configuration/users.toml/users.md) | [`min_pool_size`](../../configuration/users.toml/users.md#min_pool_size) |
 
 ## Orchestrator integration
 
@@ -112,7 +118,7 @@ Autoscaling actions are performed entirely using the internal PgDog <-> control
 
 ### Kubernetes
 
-If using autoscaling and deploying PgDog with our [Helm chart](../../../installation.md), make sure to set the pool-related settings to reflect the _total_ number of connections. For example, if deploying 3 replicas and the total pool size across the 3 pods is 600 connections, set it accordingly in `values.yaml`:
+If using autoscaling and deploying PgDog with our [Helm chart](../../installation.md), make sure to set the pool-related settings to reflect the _total_ number of connections. For example, if deploying 3 replicas and the total pool size across the 3 pods is 600 connections, set it accordingly in `values.yaml`:
 
 ```yaml title="values.yaml"
 defaultPoolSize: 600
diff --git a/docs/enterprise_edition/control_plane/features/.pages b/docs/enterprise_edition/control_plane/features/.pages
deleted file mode 100644
index 8ae5ab46..00000000
--- a/docs/enterprise_edition/control_plane/features/.pages
+++ /dev/null
@@ -1,3 +0,0 @@
-nav:
-  - index.md
-  - ...
diff --git a/docs/enterprise_edition/control_plane/features/index.md b/docs/enterprise_edition/control_plane/features/index.md
deleted file mode 100644
index f33d33ed..00000000
--- a/docs/enterprise_edition/control_plane/features/index.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-icon: material/format-list-bulleted-type
----
-
-# Features
-
-The control plane provides operational features for monitoring, configuring, and managing PgDog deployments.
-
-| Feature | Description |
-|-|-|
-| [Alerts](alerts.md) | Detect outliers in live PgDog metrics and send incidents to supported providers. |
-| [Autoscaling](autoscaling.md) | Automatically resize connection pools when PgDog nodes are added or removed. |
-| [Slack integration](slack.md) | Send deployment and configuration notifications to a Slack channel. |
diff --git a/docs/enterprise_edition/control_plane/ha.md b/docs/enterprise_edition/control_plane/ha.md
index 3346160a..41daa230 100644
--- a/docs/enterprise_edition/control_plane/ha.md
+++ b/docs/enterprise_edition/control_plane/ha.md
@@ -26,16 +26,26 @@ Whichever instance acquires the lease first will report itself as `"Ready"` to t
 
 This feature is **disabled** by default. It can be enabled and configured in the Helm chart:
 
-```yaml title="values.yaml"
-control:
-  config:
-    leader:
-      enabled: true
-      lease_name: "control2"
-      lease_duration_secs: 15
-      lease_interval_secs: 5
-      release_timeout_secs: 5
-```
+=== "Helm chart"
+    ```yaml title="values.yaml"
+    control:
+      config:
+        leader:
+          enabled: true
+          lease_name: "control2"
+          lease_duration_secs: 15
+          renew_interval_secs: 5
+          release_timeout_secs: 5
+    ```
+=== "control.toml"
+    ```toml
+    [leader]
+    enabled = true
+    lease_name = "control2"
+    lease_duration_secs = 15
+    renew_interval_secs = 5
+    release_timeout_secs = 5
+    ```
 
 Most of these settings have sane defaults:
 
@@ -44,7 +54,7 @@ Most of these settings have sane defaults:
 | `enabled` | Toggle leader election on or off. It is disabled by default (`false`). |
 | `lease_name` | The name of the `Lease` resource. Change it if you're planning to deploy more than one control plane per namespace. |
 | `lease_duration_secs` | Lease duration. Longer values prevent lease takeover due to clock skew, but slow down redeployments after unexpected pod termination. |
-| `lease_interval_secs` | How often the control plane leader attempts to renew the lease. |
+| `renew_interval_secs` | How often the control plane leader attempts to renew the lease. |
 | `release_timeout_secs` | How long the control plane will wait while shutting down gracefully for the lease to be released. |
 
 ### Default deployment
diff --git a/docs/enterprise_edition/control_plane/index.md b/docs/enterprise_edition/control_plane/index.md
index 3e22c144..4973eafe 100644
--- a/docs/enterprise_edition/control_plane/index.md
+++ b/docs/enterprise_edition/control_plane/index.md
@@ -45,17 +45,18 @@ PgDog nodes that are part of the same deployment should use the same token. It c
     A control plane deployment is capable of managing several PgDog deployments. It's not necessary (although possible) to have one control plane per PgDog deployment.
 
 
-### Connection flow
+## Architecture
 
 <center>
-    <img src="/images/control_plane.png" width="65%" alt="Control plane">
+    <img src="/images/control_plane.png" width="65%" alt="Control plane" class="theme-aware-image">
+    <p>Control plane <-> PgDog connection architecture</p>
 </center>
 
 PgDog initiates a connection to the control plane on startup. This happens in the background and doesn't block queries.
 
 Upon connecting, PgDog will send its node identifier (set in the `NODE_ID` environment variable, or randomly generated) to register with the control plane, and will start uploading telemetry and poll for commands.
 
-#### Error handling
+### Error handling
 
 Since most PgDog functions (including sharding) are configuration-driven, the control plane connection is **not required**
 for PgDog to start or serve queries.
@@ -78,5 +79,5 @@ PgDog transmits the following information to the control plane:
 
 {{ next_steps_links([
     ("Installation", "installation.md", "Deploy the control plane alongside your PgDog nodes and connect them together."),
-    ("Features", "features/index.md", "Explore control plane features like alerts, configuration management, instances, metrics, and Slack integration."),
+    ("Features", "alerts.md", "Explore control plane features like alerts, configuration management, instances, metrics, and Slack integration."),
 ]) }}
diff --git a/docs/enterprise_edition/control_plane/installation.md b/docs/enterprise_edition/control_plane/installation.md
index 027a3f2f..da5af3b3 100644
--- a/docs/enterprise_edition/control_plane/installation.md
+++ b/docs/enterprise_edition/control_plane/installation.md
@@ -94,9 +94,11 @@ ingress:
 
 ## OAuth2
 
-OAuth2 authentication is supported out of the box for GitHub and Google providers. Either one can be configured as follows:
+OAuth2 authentication is supported out of the box for GitHub and Google providers.
 
-=== "GitHub"
+### GitHub
+
+=== "Helm chart"
     ```yaml title="values.yaml"
     control:
       config:
@@ -108,7 +110,20 @@ OAuth2 authentication is supported out of the box for GitHub and Google provider
             allowed_orgs:
               - acme-corp
     ```
-=== "Google"
+=== "control.toml"
+    ```toml
+    [auth]
+    redirect_base_url = "https://control.acme.com"
+
+    [auth.github]
+    client_id = "Iv1.0123456789abcdef"
+    client_secret = "shhh"
+    allowed_orgs = ["acme-corp"]
+    ```
+
+### Google
+
+=== "Helm chart"
     ```yaml title="values.yaml"
     control:
       config:
@@ -120,6 +135,16 @@ OAuth2 authentication is supported out of the box for GitHub and Google provider
             allowed_domains:
               - acme.com
     ```
+=== "control.toml"
+    ```toml
+    [auth]
+    redirect_base_url = "https://control.acme.com"
+
+    [auth.google]
+    client_id = "0123456789-abc.apps.googleusercontent.com"
+    client_secret = "shhh"
+    allowed_domains = ["acme.com"]
+    ```
 
 The client secret can be alternatively set as an environment variable:
 
@@ -151,25 +176,48 @@ The `Secret` resource should be in the same namespace as the chart release:
 
 The secret can then be referenced in `values.yaml`:
 
-=== "GitHub"
+#### GitHub
+
+=== "Helm chart"
     ```yaml title="values.yaml"
-    github:
-      client_id: Iv1.0123456789abcdef
-      allowed_orgs:
-        - acme-corp
-      secret:
-        name: pgdog-oauth-secrets
-        clientSecretKey: github-client-secret
+    control:
+      config:
+        auth:
+          github:
+            client_id: Iv1.0123456789abcdef
+            allowed_orgs:
+              - acme-corp
+            secret:
+              name: pgdog-oauth-secrets
+              clientSecretKey: github-client-secret
     ```
-=== "Google"
+=== "control.toml"
+    ```toml
+    [auth.github]
+    client_id = "Iv1.0123456789abcdef"
+    allowed_orgs = ["acme-corp"]
+    ```
+
+#### Google
+
+=== "Helm chart"
     ```yaml title="values.yaml"
-    google:
-      client_id: 0123456789-abc.apps.googleusercontent.com
-      allowed_domains:
-        - acme.com
-      secret:
-        name: pgdog-oauth-secrets
-        clientSecretKey: google-client-secret
+    control:
+      config:
+        auth:
+          google:
+            client_id: 0123456789-abc.apps.googleusercontent.com
+            allowed_domains:
+              - acme.com
+            secret:
+              name: pgdog-oauth-secrets
+              clientSecretKey: google-client-secret
+    ```
+=== "control.toml"
+    ```toml
+    [auth.google]
+    client_id = "0123456789-abc.apps.googleusercontent.com"
+    allowed_domains = ["acme.com"]
     ```
 
 The same method can be used to store the `client_id` (using `clientIdKey` as key).
@@ -180,17 +228,38 @@ The same method can be used to store the `client_id` (using `clientIdKey` as key
 
 Both accept a list, so you can allow more than one:
 
-=== "GitHub"
+#### GitHub
+
+=== "Helm chart"
     ```yaml title="values.yaml"
-    github:
-      allowed_orgs:
-        - acme-corp
-        - acme-labs
+    control:
+      config:
+        auth:
+          github:
+            allowed_orgs:
+              - acme-corp
+              - acme-labs
     ```
-=== "Google"
+=== "control.toml"
+    ```toml
+    [auth.github]
+    allowed_orgs = ["acme-corp", "acme-labs"]
+    ```
+
+#### Google
+
+=== "Helm chart"
     ```yaml title="values.yaml"
-    google:
-      allowed_domains:
-        - acme.com
-        - acme.io
+    control:
+      config:
+        auth:
+          google:
+            allowed_domains:
+              - acme.com
+              - acme.io
+    ```
+=== "control.toml"
+    ```toml
+    [auth.google]
+    allowed_domains = ["acme.com", "acme.io"]
     ```
diff --git a/docs/enterprise_edition/control_plane/features/slack.md b/docs/enterprise_edition/control_plane/slack.md
similarity index 80%
rename from docs/enterprise_edition/control_plane/features/slack.md
rename to docs/enterprise_edition/control_plane/slack.md
index 5e77da79..4caad6c4 100644
--- a/docs/enterprise_edition/control_plane/features/slack.md
+++ b/docs/enterprise_edition/control_plane/slack.md
@@ -10,15 +10,22 @@ The control plane can send notifications to a Slack channel. Notifications inclu
 
 Slack integration is **disabled** by default and can be enabled with configuration:
 
-```yaml title="values.yaml"
-control:
-  config:
-    slack:
-      bot_token: "xoxb-[...]"
-      channel: "C0123456789"
-```
-
-The following parameters can be configured via the [Helm chart](../installation.md):
+=== "Helm chart"
+    ```yaml title="values.yaml"
+    control:
+      config:
+        slack:
+          bot_token: "xoxb-[...]"
+          channel: "C0123456789"
+    ```
+=== "control.toml"
+    ```toml
+    [slack]
+    bot_token = "xoxb-[...]"
+    channel = "C0123456789"
+    ```
+
+The following parameters can be configured via the [Helm chart](installation.md):
 
 | Parameters | Description |
 |-|-|
diff --git a/docs/enterprise_edition/schema.md b/docs/enterprise_edition/schema.md
index 50565a3a..8cee6d9b 100644
--- a/docs/enterprise_edition/schema.md
+++ b/docs/enterprise_edition/schema.md
@@ -13,7 +13,7 @@ The open source edition supports refreshing the schema for single-node deploymen
 When a client executes a DDL command, e.g. `CREATE TABLE`, PgDog will send a notification to the [control plane](control_plane/index.md). The control plane will then trigger a schema reload across all registered PgDog nodes.
 
 <center>
-    <img src="/images/ee/reload_schema.png" width="70%" alt="Reload schema">
+    <img src="/images/ee/reload_schema.png" width="70%" alt="Reload schema" class="theme-aware-image">
 </center>
 
 This process takes place in the background, so the schema snapshot across nodes is eventually consistent. This is sufficient for most applications, since migrations run as a separate process and application traffic doesn't use new tables for a considerable amount of time after the schema is changed. This gives PgDog ample time to refresh its schema snapshot.
diff --git a/docs/examples/control_plane/docker-compose.yaml b/docs/examples/control_plane/docker-compose.yaml
index 8334a5db..50ada4cb 100644
--- a/docs/examples/control_plane/docker-compose.yaml
+++ b/docs/examples/control_plane/docker-compose.yaml
@@ -1,5 +1,5 @@
 x-pgdog: &pgdog
-  image: ghcr.io/pgdogdev/pgdog-enterprise:v2026-06-24
+  image: ghcr.io/pgdogdev/pgdog-enterprise:v2026-07-09
   command:
     [
       "pgdog",
@@ -43,7 +43,7 @@ services:
     image: redis:7
 
   control:
-    image: ghcr.io/pgdogdev/pgdog-enterprise/control:v2026-06-24
+    image: ghcr.io/pgdogdev/pgdog-enterprise/control:v2026-07-09
     ports:
       - "8099:8080"
     environment:
diff --git a/docs/images/control_plane.png b/docs/images/control_plane.png
index aa2e8d41..210e2f45 100644
Binary files a/docs/images/control_plane.png and b/docs/images/control_plane.png differ
diff --git a/docs/images/ee/reload_schema.png b/docs/images/ee/reload_schema.png
index 9368056f..5893b918 100644
Binary files a/docs/images/ee/reload_schema.png and b/docs/images/ee/reload_schema.png differ
diff --git a/mkdocs.yml b/mkdocs.yml
index 1001c714..b23a9a85 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -100,6 +100,10 @@ plugins:
         'features/session-mode.md': 'features/connection-pooler/session-mode.md'
         'features/prepared-statements.md': 'features/connection-pooler/prepared-statements.md'
         'features/pub_sub.md': 'features/connection-pooler/pub_sub.md'
+        'enterprise_edition/control_plane/features/index.md': 'enterprise_edition/control_plane/index.md'
+        'enterprise_edition/control_plane/features/alerts.md': 'enterprise_edition/control_plane/alerts.md'
+        'enterprise_edition/control_plane/features/autoscaling.md': 'enterprise_edition/control_plane/autoscaling.md'
+        'enterprise_edition/control_plane/features/slack.md': 'enterprise_edition/control_plane/slack.md'
 
 extra:
   social:
diff --git a/tests/test_code_blocks.py b/tests/test_code_blocks.py
index 1b715ef0..a6707f88 100644
--- a/tests/test_code_blocks.py
+++ b/tests/test_code_blocks.py
@@ -23,6 +23,7 @@
 
 def verify(binary):
     for file in glob.glob("docs/**/*.md", recursive=True):
+        skip_toml = file.startswith("docs/enterprise_edition/control_plane/")
         with open(file, "r") as f:
             content = f.read()
         print(f"Checking {file}")
@@ -42,6 +43,8 @@ def verify(binary):
                 code = "".join(stripped_lines)
 
             if info == "toml":
+                if skip_toml:
+                    continue
                 if "[[users]]" in code:
                     check_file(binary, "users", code)
                 elif "[lib]" in code: