diff --git a/modules/ROOT/pages/clustering/clustering-advanced/multi-data-center-routing.adoc b/modules/ROOT/pages/clustering/clustering-advanced/multi-data-center-routing.adoc
index cf2ad2b9e..aa3fed1b7 100644
--- a/modules/ROOT/pages/clustering/clustering-advanced/multi-data-center-routing.adoc
+++ b/modules/ROOT/pages/clustering/clustering-advanced/multi-data-center-routing.adoc
@@ -56,7 +56,7 @@ Applying the same tag to multiple servers logically groups them together.
 Note that servers can have mulitple tags.
 
 Server tags are defined as a key that maps onto a set of servers in a cluster.
-Server tags are defined on each server using the  `xref:configuration/configuration-settings.adoc#config_server.server.tags[initial.server.tags]` parameter in _neo4j.conf_.
+Server tags are defined on each server using the  xref:configuration/configuration-settings.adoc#config_server.tags[`initial.server.tags`] parameter in _neo4j.conf_.
 Each server in a cluster can be tagged with to zero or more server tags.
 Server tags can be altered at runtime via the `ALTER SERVER` command,
 see xref:clustering/servers.adoc#alter-server-options[Altering server options] for more details.
diff --git a/modules/ROOT/pages/clustering/servers.adoc b/modules/ROOT/pages/clustering/servers.adoc
index 1358abfa1..253a724d0 100644
--- a/modules/ROOT/pages/clustering/servers.adoc
+++ b/modules/ROOT/pages/clustering/servers.adoc
@@ -129,10 +129,14 @@ neo4j@neo4j> ENABLE SERVER '25a7efc7-d063-44b8-bdee-f23357f89f01' OPTIONS
 `allowedDatabases` and `deniedDatabases` are collections of database names that filter which databases may be hosted on a server.
 The `allowedDatabases` and `deniedDatabases` are mutually exclusive and if both are specified, an error is returned.
 
+Optionally, it is possible to automatically enable free servers by setting the xref:configuration/configuration-settings.adoc#config_initial.dbms.automatically_enable_free_servers[`initial.dbms.automatically_enable_free_servers`] to `true`.
+This can be changed after startup using the xref:reference/procedures.adoc#procedure_dbms_cluster_setAutomaticallyEnableFreeServers[`dbms.cluster.setAutomaticallyEnableFreeServers`] procedure.
+
 Server `tags` are used during database allocation and when configuring load balancing and replication policies.
 They cannot contain duplicates, so `tags:['eu', 'eu']` will return an error.
 Server tags also cannot contain commas.
 When altering server tags via cypher, the encoding is done via UTF-8.
+
 [NOTE]
 ====
 `allowedDatabases` and `deniedDatabases` do not affect Composite databases, they are always available everywhere.
diff --git a/modules/ROOT/pages/clustering/settings.adoc b/modules/ROOT/pages/clustering/settings.adoc
index 1b5c458e7..d1a57d78a 100644
--- a/modules/ROOT/pages/clustering/settings.adoc
+++ b/modules/ROOT/pages/clustering/settings.adoc
@@ -18,6 +18,10 @@ Once enabled, a server's mode constraint can only be changed with `ALTER SERVER
 **Example**: a server configured with `initial.server.mode_constraint=SECONDARY` is only allocated databases whose topologies contain 1 or more secondary.
 This server always only hosts those databases in `SECONDARY` mode.
 
+| xref:configuration/configuration-settings.adoc#config_initial.dbms.automatically_enable_free_servers[`initial.dbms.automatically_enable_free_servers`]
+| This setting allows for auto-enable of servers in the `FREE` state.
+After startup, it can be changed with the xref:reference/procedures.adoc#procedure_dbms_cluster_setAutomaticallyEnableFreeServers[`dbms.cluster.setAutomaticallyEnableFreeServers`] procedure.
+
 | xref:configuration/configuration-settings.adoc#config_server.cluster.system_database_mode[`server.cluster.system_database_mode`]
 | Every cluster member hosts the `system` database.
 This config controls what mode a given instance hosts the `system` database in: `PRIMARY` or `SECONDARY`.