diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 9f72b634a..297c90f26 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -129,6 +129,13 @@ plugins:
         'middlewares/tcp/inflightconn.md': 'reference/routing-configuration/tcp/middlewares/inflightconn.md'
         'middlewares/tcp/ipwhitelist.md': 'reference/routing-configuration/tcp/middlewares/ipallowlist.md'
         'middlewares/tcp/ipallowlist.md': 'reference/routing-configuration/tcp/middlewares/ipallowlist.md'
+        ## User Guides
+        'user-guides/crd-acme/index.md': 'expose/kubernetes.md'
+        'user-guides/cert-manager.md': 'expose/kubernetes.md'
+        'user-guides/docker-compose/basic-example/index.md': 'expose/docker.md'
+        'user-guides/docker-compose/acme-tls/index.md': 'expose/docker.md'
+        'user-guides/docker-compose/acme-http/index.md': 'expose/docker.md'
+        'user-guides/docker-compose/acme-dns/index.md': 'expose/docker.md'
         # References
         # Static Configuration
         'reference/static-configuration/overview.md': 'reference/install-configuration/configuration-options.md'
@@ -251,7 +258,7 @@ nav:
           - 'Health Check (CLI & Ping)': 'reference/install-configuration/observability/healthcheck.md'
       - 'Options List': 'reference/install-configuration/configuration-options.md'
     - 'Routing Configuration':
-        - 'General' :
+        - 'Common Configuration' :
           - 'Configuration Methods' : 'reference/routing-configuration/dynamic-configuration-methods.md'
           - 'HTTP' :
             - 'Router' :
@@ -341,24 +348,16 @@ nav:
           - 'ECS' : 'reference/routing-configuration/other-providers/ecs.md'
           - 'KV' : 'reference/routing-configuration/other-providers/kv.md'
         - 'File' : 'reference/routing-configuration/other-providers/file.md'
-  - 'Security':
-        - 'Content-Length': 'security/content-length.md'
-        - 'TLS in Multi-Tenant Kubernetes': 'security/tls-certs-in-multi-tenant-kubernetes.md'
+    - 'Security':
+          - 'Content-Length': 'security/content-length.md'
+          - 'TLS in Multi-Tenant Kubernetes': 'security/tls-certs-in-multi-tenant-kubernetes.md'
+    - 'Deprecation Notices':
+        - 'Releases': 'deprecation/releases.md'
+        - 'Features': 'deprecation/features.md'
   - 'User Guides':
       - 'FastProxy': 'user-guides/fastproxy.md'
-      - 'Kubernetes and Let''s Encrypt': 'user-guides/crd-acme/index.md'
-      - 'Kubernetes and cert-manager': 'user-guides/cert-manager.md'
       - 'gRPC Examples': 'user-guides/grpc.md'
       - 'WebSocket Examples': 'user-guides/websocket.md'
-      - 'Docker':
-        - 'Basic Example': 'user-guides/docker-compose/basic-example/index.md'
-        - 'HTTPS with Let''s Encrypt':
-          - 'TLS Challenge': 'user-guides/docker-compose/acme-tls/index.md'
-          - 'HTTP Challenge': 'user-guides/docker-compose/acme-http/index.md'
-          - 'DNS Challenge': 'user-guides/docker-compose/acme-dns/index.md'
-  - 'Deprecation Notices':
-      - 'Releases': 'deprecation/releases.md'
-      - 'Features': 'deprecation/features.md'
   - 'Contributing':
       - 'Thank You!': 'contributing/thank-you.md'
       - 'Submitting Issues': 'contributing/submitting-issues.md'
@@ -369,4 +368,4 @@ nav:
       - 'Data Collection': 'contributing/data-collection.md'
       - 'Advocating': 'contributing/advocating.md'
       - 'Maintainers': 'contributing/maintainers.md'
-  - 'Frequently Asked Questions': 'getting-started/faq.md'
+  - 'FAQ': 'getting-started/faq.md'