diff --git a/content/influxdb3/enterprise/reference/config-options.md b/content/influxdb3/enterprise/reference/config-options.md
index e1d4ef4690..57a238b96b 100644
--- a/content/influxdb3/enterprise/reference/config-options.md
+++ b/content/influxdb3/enterprise/reference/config-options.md
@@ -62,6 +62,9 @@ influxdb3 serve
   - [tls-minimum-versions](#tls-minimum-version)
   - [without-auth](#without-auth)
   - [disable-authz](#disable-authz)
+  - [num-database-limit](#num-database-limit)
+  - [num-table-limit](#num-table-limit)
+  - [num-total-columns-per-table-limit](#num-total-columns-per-table-limit)
 - [AWS](#aws)
   - [aws-access-key-id](#aws-access-key-id)
   - [aws-secret-access-key](#aws-secret-access-key)
@@ -302,8 +305,8 @@ The minimum version for TLS.
 Valid values are `tls-1.2` or `tls-1.3`.
 Default is `tls-1.2`.
 
-| influxdb3 serve option  | Environment variable     |
-| :---------------------- | :----------------------- |
+| influxdb3 serve option  | Environment variable            |
+| :---------------------- | :------------------------------ |
 | `--tls-minimum-version` | `INFLUXDB3_TLS_MINIMUM_VERSION` |
 
 ---
@@ -313,6 +316,10 @@ Default is `tls-1.2`.
 Disables authentication for all server actions (CLI commands and API requests).
 The server processes all requests without requiring tokens or authentication.
 
+| influxdb3 serve option | Environment variable           |
+| :--------------------- | :----------------------------- |
+| `--without-auth`       | `INFLUXDB3_START_WITHOUT_AUTH` |
+
 ---
 
 #### disable-authz
@@ -320,6 +327,43 @@ The server processes all requests without requiring tokens or authentication.
 Optionally disable authz by passing in a comma separated list of resources. 
 Valid values are `health`, `ping`, and `metrics`.
 
+| influxdb3 serve option | Environment variable      |
+| :--------------------- | :------------------------ |
+| `--disable-authz`      | `INFLUXDB3_DISABLE_AUTHZ` |
+
+---
+
+#### num-database-limit
+
+Limits the total number of active databases.
+Default is {{% influxdb3/limit "database" %}}.
+
+| influxdb3 serve option | Environment variable                      |
+| :--------------------- | :---------------------------------------- |
+| `--num-database-limit` | `INFLUXDB3_ENTERPRISE_NUM_DATABASE_LIMIT` |
+
+---
+
+#### num-table-limit
+
+Limits the total number of active tables across all databases.
+Default is {{% influxdb3/limit "table" %}}.
+
+| influxdb3 serve option | Environment variable                   |
+| :--------------------- | :------------------------------------- |
+| `--num-table-limit`    | `INFLUXDB3_ENTERPRISE_NUM_TABLE_LIMIT` |
+
+---
+
+#### num-total-columns-per-table-limit
+
+Limits the total number of columns per table.
+Default is {{% influxdb3/limit "column" %}}.
+
+| influxdb3 serve option                | Environment variable                                     |
+| :------------------------------------ | :------------------------------------------------------- |
+| `--num-total-columns-per-table-limit` | `INFLUXDB3_ENTERPRISE_NUM_TOTAL_COLUMNS_PER_TABLE_LIMIT` |
+
 ---
 
 ### AWS
@@ -824,7 +868,7 @@ Sets the thread priority for tokio DataFusion runtime workers.
 
 #### datafusion-max-parquet-fanout
 
-When multiple parquet files are required in a sorted way
+When multiple Parquet files are required in a sorted way
 (deduplication for example), specifies the maximum fanout.
 
 **Default:** `1000`
@@ -837,7 +881,7 @@ When multiple parquet files are required in a sorted way
 
 #### datafusion-use-cached-parquet-loader
 
-Uses a cached parquet loader when reading parquet files from the object store.
+Uses a cached Parquet loader when reading Parquet files from the object store.
 
 | influxdb3 serve option                   | Environment variable                             |
 | :--------------------------------------- | :----------------------------------------------- |
diff --git a/content/shared/influxdb3-admin/databases/_index.md b/content/shared/influxdb3-admin/databases/_index.md
index 73d148aaea..f3f59aef7b 100644
--- a/content/shared/influxdb3-admin/databases/_index.md
+++ b/content/shared/influxdb3-admin/databases/_index.md
@@ -13,7 +13,7 @@ stored. Each database can contain multiple tables.
 > **If coming from InfluxDB v2, InfluxDB Cloud (TSM), or InfluxDB Cloud Serverless**,
 > _database_ and _bucket_ are synonymous.
 
-<!--
+{{% show-in "enterprise" %}}
 ## Retention periods
 
 A database **retention period** is the maximum age of data stored in the database.
@@ -22,10 +22,9 @@ When a point's timestamp is beyond the retention period (relative to now), the
 point is marked for deletion and is removed from the database the next time the
 retention enforcement service runs.
 
-The _minimum_ retention period for an InfluxDB database is 1 hour.
-The _maximum_ retention period is infinite meaning data does not expire and will
-never be removed by the retention enforcement service.
--->
+The _maximum_ retention period is infinite (`none`) meaning data does not expire
+and will never be removed by the retention enforcement service.
+{{% /show-in %}}
 
 ## Database, table, and column limits
 
@@ -40,9 +39,11 @@ never be removed by the retention enforcement service.
 **Maximum number of tables across all databases**: {{% influxdb3/limit "table" %}}
 
 {{< product-name >}} limits the number of tables you can have across _all_
-databases to {{% influxdb3/limit "table" %}}. There is no specific limit on how
-many tables you can have in an individual database, as long as the total across
-all databases is below the limit.
+databases to {{% influxdb3/limit "table" %}}{{% show-in "enterprise" %}} by default{{% /show-in %}}.
+{{% show-in "enterprise" %}}You can configure the table limit using the
+[`--num-table-limit` configuration option](/influxdb3/enterprise/reference/config-options/#num-table-limit).{{% /show-in %}}
+InfluxDB doesn't limit how many tables you can have in an individual database,
+as long as the total across all databases is below the limit.
 
 Having more tables affects your {{% product-name %}} installation in the
 following ways:
@@ -64,7 +65,8 @@ persists data to Parquet files. Each `PUT` request incurs a monetary cost and
 increases the operating cost of {{< product-name >}}.
 
 {{% /expand %}}
-{{% expand "**More work for the compactor** _(Enterprise only)_ <em style='opacity:.5;font-weight:normal;'>View more info</em>" %}}
+{{% show-in "enterprise" %}}
+{{% expand "**More work for the compactor** <em style='opacity:.5;font-weight:normal;'>View more info</em>" %}}
 
 To optimize storage over time, InfluxDB 3 Enterprise has a compactor that
 routinely compacts Parquet files.
@@ -72,6 +74,7 @@ With more tables and Parquet files to compact, the compactor may need to be scal
 to keep up with demand, adding to the operating cost of InfluxDB 3 Enterprise.
 
 {{% /expand %}}
+{{% /show-in %}}
 {{< /expand-wrapper >}}
 
 ### Column limit
@@ -80,11 +83,17 @@ to keep up with demand, adding to the operating cost of InfluxDB 3 Enterprise.
 
 Each row must include a time column, with the remaining columns representing
 tags and fields.
-As a result, a table can have one time column and up to {{% influxdb3/limit "column" -1 %}}
+As a result,{{% show-in "enterprise" %}} by default,{{% /show-in %}} a table can
+have one time column and up to {{% influxdb3/limit "column" -1 %}}
 _combined_ field and tag columns.
 If you attempt to write to a table and exceed the column limit, the write
 request fails and InfluxDB returns an error.
 
+{{% show-in "enterprise" %}}
+You can configure the maximum number of columns per
+table using the [`num-total-columns-per-table-limit` configuration option](/influxdb3/enterprise/reference/config-options/#num-total-columns-per-table-limit).
+{{% /show-in %}}
+
 Higher numbers of columns has the following side-effects:
 
 {{< expand-wrapper >}}
diff --git a/content/shared/influxdb3-admin/databases/create.md b/content/shared/influxdb3-admin/databases/create.md
index bbac8fa269..fd95461747 100644
--- a/content/shared/influxdb3-admin/databases/create.md
+++ b/content/shared/influxdb3-admin/databases/create.md
@@ -130,7 +130,12 @@ database_name/retention_policy_name
 
 ## Database limit
 
+{{% show-in "enterprise" %}}
+**Default maximum number of databases**: {{% influxdb3/limit "database" %}}
+{{% /show-in %}}
+{{% show-in "core" %}}
 **Maximum number of databases**: {{% influxdb3/limit "database" %}}
+{{% /show-in %}}
 
 _For more information about {{< product-name >}} database, table, and column limits,
 see [Database, table, and column limits](/influxdb3/version/admin/databases/#database-table-and-column-limits)._