diff --git a/docs/administration/multi-tenancy.md b/docs/administration/multi-tenancy.md
index 96e8666a..1cc0b363 100644
--- a/docs/administration/multi-tenancy.md
+++ b/docs/administration/multi-tenancy.md
@@ -1,5 +1,10 @@
 # Multi-tenancy
 
+!!! tip "Under construction"
+
+    This feature is under development.
+
+{% if "multi-tenancy" in (config.extra.feature_flags.enabled|string|lower|replace(" ", "")).split(",") %}
 This page explains how to configure and manage multi-tenancy in OpenAEV, enabling multiple isolated workspaces on a single platform instance.
 
 !!! tip "Enterprise Edition"
@@ -102,3 +107,4 @@ OPENAEV_PROVIDER_AZURE_TENANT_ID=<your-tenant-uuid>
 - [Enterprise Edition](enterprise.md) — Activate your EE license
 - [Authentication](../deployment/authentication.md) — Set up SSO providers for tenant mapping
 - [Hub](hub.md) — Manage platform-wide resources shared across tenants
+{% endif %}
\ No newline at end of file
diff --git a/docs/deployment/configuration.md b/docs/deployment/configuration.md
index e339cd09..4f9e1636 100644
--- a/docs/deployment/configuration.md
+++ b/docs/deployment/configuration.md
@@ -69,7 +69,7 @@ certificates in the folder are public PEM-armoured (*.pem), DER-encoded X509 cer
 | logging.logback.rollingpolicy.max-file-size | LOGGING_LOGBACK_ROLLINGPOLICY_MAX-FILE-SIZE | 10MB               | Rolling max file size                         |
 | logging.logback.rollingpolicy.max-history   | LOGGING_LOGBACK_ROLLINGPOLICY_MAX-HISTORY   | 7                  | Rolling max days                              |
 
-{% if "audit-log" not in (config.extra.feature_flags.disabled|string|lower|replace(" ", "")).split(",") %}
+{% if "audit-log" in (config.extra.feature_flags.enabled|string|lower|replace(" ", "")).split(",") %}
 #### Audit Logging
 
 Audit logging will allow you to have a trace of the actions performed using API calls.
diff --git a/mkdocs.yml b/mkdocs.yml
index 01ec59fd..fa964b91 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -35,7 +35,7 @@ extra_css:
 # Extra
 extra:
   feature_flags:
-    disabled: !ENV [DOCS_FEATURE_FLAGS, "audit-log"]
+    enabled: !ENV [DOCS_FEATURE_FLAGS] # enabled: !ENV [DOCS_FEATURE_FLAGS, "audit-log,multi-tenancy"]
   version:
     provider: mike
   analytics: