diff --git a/modules/ROOT/pages/authentication-authorization/access-control.adoc b/modules/ROOT/pages/authentication-authorization/access-control.adoc
index 31ebfa2c3..13e2fa5a6 100644
--- a/modules/ROOT/pages/authentication-authorization/access-control.adoc
+++ b/modules/ROOT/pages/authentication-authorization/access-control.adoc
@@ -82,7 +82,7 @@ This same database would be used by a number of different users, each with diffe
 
 Unlike applications which often require users to be modeled within the application itself, databases provide user management resources such as roles and privileges.
 This allows users to be created entirely within the database security model, a strategy that allows the separation of access to the data and the data itself.
-For more information, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/[Cypher Manual -> Access control].
+For more information, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/[Cypher Manual -> Access control].
 
 The following examples show two different approaches to using Neo4j security features to support the _healthcare_ database application.
 The first approach uses xref:authentication-authorization/built-in-roles/auth-built-in-roles[Built-in roles], whereas the second uses more advanced resources with fine-grained privileges for <<auth-access-control-using-privileges, sub-graph access control>>.
@@ -258,7 +258,7 @@ SHOW ROLE itadmin PRIVILEGES AS COMMANDS;
 
 [NOTE]
 ====
-Privileges that were granted or denied earlier can be revoked using link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/manage-privileges/#access-control-revoke-privileges[the `REVOKE` command].
+Privileges that were granted or denied earlier can be revoked using link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/manage-privileges/#access-control-revoke-privileges[the `REVOKE` command].
 ====
 
 To provide the IT administrator `tina` these privileges, they must be assigned the new role `itadmin`:
@@ -472,7 +472,7 @@ If the `researcherB` role is revoked to Charlie, but `researcherW` is granted, w
 
 [NOTE]
 ====
-Privileges that were granted or denied earlier can be revoked using link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/manage-privileges/#access-control-revoke-privileges[the `REVOKE` command].
+Privileges that were granted or denied earlier can be revoked using link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/manage-privileges/#access-control-revoke-privileges[the `REVOKE` command].
 ====
 
 === Privileges of `doctor`
@@ -749,7 +749,7 @@ GRANT DELETE ON GRAPH healthcare RELATIONSHIPS HAS, DIAGNOSIS TO receptionist;
 
 [NOTE]
 ====
-Privileges that were granted or denied earlier can be revoked using link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/manage-privileges/#access-control-revoke-privileges[the `REVOKE` command].
+Privileges that were granted or denied earlier can be revoked using link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/manage-privileges/#access-control-revoke-privileges[the `REVOKE` command].
 ====
 
 === Privileges of `nurse`
@@ -796,7 +796,7 @@ SHOW USER daniel PRIVILEGES AS COMMANDS;
 
 [NOTE]
 ====
-Privileges that were granted or denied earlier can be revoked using link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/manage-privileges/#access-control-revoke-privileges[the `REVOKE` command].
+Privileges that were granted or denied earlier can be revoked using link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/manage-privileges/#access-control-revoke-privileges[the `REVOKE` command].
 ====
 
 Now the intention is that a nurse can perform the actions of a receptionist, which means they should be able to read and write the `address` field of the `Patient` nodes.
@@ -1051,7 +1051,7 @@ neo4j@system> SHOW USER tina PRIVILEGES AS COMMANDS;
 ====
 No other privilege management privileges were granted here.
 How much power this role should have would depend on the requirements of the system.
-Refer to the section link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/built-in-roles/[Cypher Manual -> The `admin` role] for a complete list of privileges to consider.
+Refer to the section link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/built-in-roles/[Cypher Manual -> The `admin` role] for a complete list of privileges to consider.
 ====
 
 Now Tina should be able to create new users and assign them to roles:
diff --git a/modules/ROOT/pages/authentication-authorization/built-in-roles.adoc b/modules/ROOT/pages/authentication-authorization/built-in-roles.adoc
index 1ba71eefd..0da3d645f 100644
--- a/modules/ROOT/pages/authentication-authorization/built-in-roles.adoc
+++ b/modules/ROOT/pages/authentication-authorization/built-in-roles.adoc
@@ -417,4 +417,4 @@ The subset of the functionality which is available with Community Edition is als
 |===
 
 More information about the built-in roles and their privileges can be found in
-link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/built-in-roles[Neo4j Cypher Manual].
+link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/built-in-roles[Neo4j Cypher Manual].
diff --git a/modules/ROOT/pages/authentication-authorization/introduction.adoc b/modules/ROOT/pages/authentication-authorization/introduction.adoc
index b789ff831..03ada1331 100644
--- a/modules/ROOT/pages/authentication-authorization/introduction.adoc
+++ b/modules/ROOT/pages/authentication-authorization/introduction.adoc
@@ -25,7 +25,7 @@ For more information, see xref:configuration/password-and-user-recovery.adoc[Pas
 When triggered, Neo4j logs an error containing a timestamp and the message `failed to log in: too many failed attempts` in the _security.log_.
 ====
 +
-The Cypher commands to manage users, roles, and permissions are described in detail in link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/[Cypher Manual -> Administration].
+The Cypher commands to manage users, roles, and permissions are described in detail in link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/[Cypher Manual -> Access control].
 Various scenarios that illustrate the use of the native auth provider are available in xref:authentication-authorization/access-control.adoc[Fine-grained access control].
 
 *LDAP auth provider*::
diff --git a/modules/ROOT/pages/authentication-authorization/ldap-integration.adoc b/modules/ROOT/pages/authentication-authorization/ldap-integration.adoc
index 6d3b14cd3..a62ee4863 100644
--- a/modules/ROOT/pages/authentication-authorization/ldap-integration.adoc
+++ b/modules/ROOT/pages/authentication-authorization/ldap-integration.adoc
@@ -123,7 +123,7 @@ dbms.security.ldap.authorization.group_to_role_mapping=\
 <3> Mapping of two LDAP groups to a Neo4j built-in role.
 <4> Mapping of an LDAP group to a custom-defined role.
 Custom-defined roles, such as `rolename`, must be explicitly created using the `CREATE ROLE rolename` command before they can be used to grant privileges.
-See link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/manage-users[the Cypher Manual -> Creating roles].
+See link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/manage-roles[the Cypher Manual -> Creating roles].
 ====
 
 [[auth-ldap-configure-provider-ad]]
diff --git a/modules/ROOT/pages/authentication-authorization/manage-execute-permissions.adoc b/modules/ROOT/pages/authentication-authorization/manage-execute-permissions.adoc
index cf22f8ca5..95802bccf 100644
--- a/modules/ROOT/pages/authentication-authorization/manage-execute-permissions.adoc
+++ b/modules/ROOT/pages/authentication-authorization/manage-execute-permissions.adoc
@@ -22,12 +22,12 @@ Please refer to link:{neo4j-docs-base-uri}/java-reference/{page-version}/extendi
 [[auth-manage-procedure-permissions]]
 == Manage procedure permissions
 
-Procedure permissions can be managed using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-dbms-administration-execute[native execute privileges].
+Procedure permissions can be managed using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-dbms-administration-execute[native execute privileges].
 These control whether the user is allowed to both execute a procedure, and which set of privileges apply during the execution.
 
-A procedure may be run using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-execute-procedure[`EXECUTE PROCEDURE` privilege].
+A procedure may be run using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-execute-procedure[`EXECUTE PROCEDURE` privilege].
 
-This allows the user to execute procedures that match the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-name-globbing[globbed procedures].
+This allows the user to execute procedures that match the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-name-globbing[globbed procedures].
 
 .Grant privilege to execute procedure
 ====
@@ -48,7 +48,7 @@ GRANT TRAVERSE ON GRAPH * RELATIONSHIP R1 TO role
 When calling the `db.schema.visualization` procedure that user will only see the `A` and `B` nodes and `R1` relationships, even though there might exist other nodes and relationships.
 ====
 
-A procedure may also be executed with elevated privileges using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-execute-boosted-procedure[`EXECUTE BOOSTED PROCEDURE` privilege].
+A procedure may also be executed with elevated privileges using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-execute-boosted-procedure[`EXECUTE BOOSTED PROCEDURE` privilege].
 
 [NOTE]
 --
@@ -74,12 +74,12 @@ When calling the `db.schema.visualization` procedure that user will see all node
 [[auth-manage-function-permissions]]
 == Manage user-defined function permissions
 
-User-defined function permissions can be managed using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-dbms-administration-execute[native execute privileges].
+User-defined function permissions can be managed using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-dbms-administration-execute[native execute privileges].
 These control if the user is both allowed to execute a user-defined function, and which set of privileges apply during the execution.
 
-A user-defined function may be executed using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-execute-user-defined-function[`EXECUTE USER DEFINED FUNCTION` privilege].
+A user-defined function may be executed using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-execute-user-defined-function[`EXECUTE USER DEFINED FUNCTION` privilege].
 
-This allows the user to execute user-defined functions that match the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-name-globbing[globbed user-defined function].
+This allows the user to execute user-defined functions that match the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-name-globbing[globbed user-defined function].
 
 .Grant privilege to execute user-defined function
 ====
@@ -100,7 +100,7 @@ When calling the user-defined function `MATCH (a:A) RETURN apoc.any.properties(a
 ====
 
 A user-defined function may also be executed with elevated privileges using the
-link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-execute-boosted-user-defined-function[`EXECUTE BOOSTED USER DEFINED FUNCTION` privilege].
+link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-execute-boosted-user-defined-function[`EXECUTE BOOSTED USER DEFINED FUNCTION` privilege].
 
 [NOTE]
 --
diff --git a/modules/ROOT/pages/authentication-authorization/sso-integration.adoc b/modules/ROOT/pages/authentication-authorization/sso-integration.adoc
index 4441d0cd7..c17e8352f 100644
--- a/modules/ROOT/pages/authentication-authorization/sso-integration.adoc
+++ b/modules/ROOT/pages/authentication-authorization/sso-integration.adoc
@@ -181,7 +181,7 @@ dbms.security.oidc.mysso.authorization.group_to_role_mapping=\
 <3> Mapping of two identity provider groups to a Neo4j built-in role.
 <4> Mapping of an identity provider group to a custom-defined role.
 Custom-defined roles, such as `rolename`, must be explicitly created using the `CREATE ROLE rolename` command before they can be used to grant privileges.
-See link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/manage-users[the Cypher Manual -> Creating roles].
+See link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/manage-roles[the Cypher Manual -> Creating roles].
 ====
 
 [[auth-sso-configure-provider]]
diff --git a/modules/ROOT/pages/clustering/databases.adoc b/modules/ROOT/pages/clustering/databases.adoc
index 790a3589c..5d32a772d 100644
--- a/modules/ROOT/pages/clustering/databases.adoc
+++ b/modules/ROOT/pages/clustering/databases.adoc
@@ -9,7 +9,7 @@ If a database is no longer needed, the command `DROP DATABASE` deletes the datab
 
 == `CREATE DATABASE`
 
-The command to create a database in a cluster is not significantly different from the command to create a database in a non-clustered environment (see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/databases[Cypher Manual -> Database management] for more information on database management on single servers).
+The command to create a database in a cluster is not significantly different from the command to create a database in a non-clustered environment (see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases[Cypher Manual -> Database management] for more information on database management on single servers).
 The difference in a clustered environment is that the topology can be specified, i.e. how many primaries and secondaries are desired for the database.
 To create a database `foo` with 3 servers hosting the database in primary mode and 2 servers in secondary mode, the command looks like this:
 
diff --git a/modules/ROOT/pages/clustering/servers.adoc b/modules/ROOT/pages/clustering/servers.adoc
index e492d622a..b5e1dc6c3 100644
--- a/modules/ROOT/pages/clustering/servers.adoc
+++ b/modules/ROOT/pages/clustering/servers.adoc
@@ -251,7 +251,7 @@ neo4j@neo4j> ALTER SERVER '25a7efc7-d063-44b8-bdee-f23357f89f01' SET OPTIONS {mo
 Altering servers may cause databases to be moved, and should be performed with care.
 For example, if the server `25a7efc7-d063-44b8-bdee-f23357f89f01` hosts database `foo` in primary mode when the above command is executed, then another server must begin hosting `foo` in primary mode.
 Likewise, if `ALTER SERVER '25a7efc7-d063-44b8-bdee-f23357f89f01' SET OPTIONS {allowedDatabases:['bar','baz']};` is executed, then `foo` is forced to move.
-For a description of all the server options (e.g., server tags) that can be altered via the `ALTER SERVER` command, see the xref:link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/server-management/#server-management-alter-server[Cypher Manual -> Modifying servers].
+For a description of all the server options (e.g., server tags) that can be altered via the `ALTER SERVER` command, see the xref:link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/servers/#server-management-alter-server[Cypher Manual -> Modifying servers].
 
 [NOTE]
 ====
diff --git a/modules/ROOT/pages/composite-databases/introduction.adoc b/modules/ROOT/pages/composite-databases/introduction.adoc
index a0c503483..9d871b48a 100644
--- a/modules/ROOT/pages/composite-databases/introduction.adoc
+++ b/modules/ROOT/pages/composite-databases/introduction.adoc
@@ -24,7 +24,7 @@ These graphs are added to the composite database by means of database aliases.
 A Neo4j DBMS can have multiple composite databases, and they can be created both in single-instance deployments, and in cluster deployments.
 
 Composite databases are managed using administrative commands.
-They are created with the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/databases#administration-databases-create-composite-database[`CREATE COMPOSITE DATABASE`] command.
+They are created with the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases#administration-databases-create-composite-database[`CREATE COMPOSITE DATABASE`] command.
 
 .Creating a composite database
 ====
@@ -34,7 +34,7 @@ CREATE COMPOSITE DATABASE cineasts
 ----
 ====
 
-Constituent graphs are added with the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/aliases#alias-management-create-database-alias[`CREATE ALIAS`] administrative command, for example:
+Constituent graphs are added with the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/aliases#alias-management-create-database-alias[`CREATE ALIAS`] administrative command, for example:
 
 .Creating an alias on a composite database
 ====
@@ -59,7 +59,7 @@ CREATE ALIAS cineasts.upcoming
 ----
 ====
 
-The link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/databases#administration-databases-show-databases[`SHOW DATABASE`] administrative command includes composite databases.
+The link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases#administration-databases-show-databases[`SHOW DATABASE`] administrative command includes composite databases.
 
 Their `type` is reported as `"composite"`, and the `constituents` column lists the names of the aliases contained.
 
@@ -80,7 +80,7 @@ SHOW DATABASE cineasts YIELD name, type, constituents
 ====
 
 
-The link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/aliases#alias-management-show-alias[`SHOW ALIASES FOR DATABASE`] administrative command can be used to inspect aliases on composite databases in further detail.
+The link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/aliases#alias-management-show-alias[`SHOW ALIASES FOR DATABASE`] administrative command can be used to inspect aliases on composite databases in further detail.
 
 .Showing composite database aliases
 ====
@@ -98,4 +98,4 @@ SHOW ALIASES FOR DATABASE
 ----
 ====
 
-For a full description of the administrative commands for managing composite databases, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/databases[Cypher Manual -> Database management].
+For a full description of the administrative commands for managing composite databases, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases[Cypher Manual -> Database management].
diff --git a/modules/ROOT/pages/manage-databases/configuration.adoc b/modules/ROOT/pages/manage-databases/configuration.adoc
index 01066351f..668850e03 100644
--- a/modules/ROOT/pages/manage-databases/configuration.adoc
+++ b/modules/ROOT/pages/manage-databases/configuration.adoc
@@ -11,7 +11,7 @@
 Administrative commands should not be used during a rolling upgrade.
 For more information, see link:{neo4j-docs-base-uri}/upgrade-migration-guide/upgrade/upgrade-4.4/causal-cluster/[Upgrade and Migration Guide -> Upgrade a cluster].
 
-For detailed information on Cypher administrative commands, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/databases[Cypher Manual -> Database management].
+For detailed information on Cypher administrative commands, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases[Cypher Manual -> Database management].
 ====
 
 Before using administrative commands, it is important to understand the difference between stopped databases, and dropped databases:
@@ -75,9 +75,9 @@ For example, `main.db` is a valid database name.
 ====
 
 It is possible to create an alias to refer to an existing database to avoid these restrictions.
-For more information, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/aliases#alias-management-create-database-alias[Cypher Manual -> Creating database aliases].
+For more information, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/aliases#alias-management-create-database-alias[Cypher Manual -> Creating database aliases].
 
-For detailed information on Cypher administrative commands, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control[Cypher Manual -> Access Control].
+For detailed information on Cypher administrative commands, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control[Cypher Manual -> Access Control].
 
 For examples of using the Cypher administrative commands to manage multiple active databases, see xref:manage-databases/queries.adoc[Queries].
 
@@ -147,7 +147,7 @@ Regardless of settings of `server.databases.default_to_read_only`, `server.datab
 
 [NOTE]
 ====
-Another way of preventing writes is to set the database access to read-only using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/databases#administration-databases-alter-database[ALTER DATABASE] command.
+Another way of preventing writes is to set the database access to read-only using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases#administration-databases-alter-database[ALTER DATABASE] command.
 ====
 
 
diff --git a/modules/ROOT/pages/manage-databases/errors.adoc b/modules/ROOT/pages/manage-databases/errors.adoc
index 4aaf0ec58..e8803c372 100644
--- a/modules/ROOT/pages/manage-databases/errors.adoc
+++ b/modules/ROOT/pages/manage-databases/errors.adoc
@@ -173,7 +173,7 @@ neo4j@system> SHOW DATABASE foo;
 ----
 ====
 
-If repeated retries of a command have no effect, or if a database is in a `dirty` state, you may drop and recreate the database, as detailed in link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/databases[Cypher manual -> Database management].
+If repeated retries of a command have no effect, or if a database is in a `dirty` state, you may drop and recreate the database, as detailed in link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases[Cypher manual -> Database management].
 
 [NOTE]
 ====
diff --git a/modules/ROOT/pages/manage-databases/introduction.adoc b/modules/ROOT/pages/manage-databases/introduction.adoc
index cf7e9324c..fee27497e 100644
--- a/modules/ROOT/pages/manage-databases/introduction.adoc
+++ b/modules/ROOT/pages/manage-databases/introduction.adoc
@@ -77,11 +77,11 @@ All installations include the `system` database.
 All installations include a built-in database named `system`, which contains meta-data and security configuration.
 
 The `system` database behaves differently than all other databases.
-In particular, when connected to this database you can only perform a specific set of administrative functions, as described in detail in link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/databases[Cypher Manual -> Database management].
+In particular, when connected to this database you can only perform a specific set of administrative functions, as described in detail in link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases[Cypher Manual -> Database management].
 
 Most of the available administrative commands are restricted to users with specific administrative privileges.
 An example of configuring security privileges is described in xref:authentication-authorization/access-control.adoc[Fine-grained access control].
-Security administration is described in detail in link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control[Cypher Manual -> Access Control] .
+Security administration is described in detail in link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control[Cypher Manual -> Access Control] .
 
 The following image illustrates an installation of Neo4j with multiple active databases, named `marketing`, `sales`, and `hr`:
 
@@ -111,4 +111,4 @@ Per-user home databases are controlled via the Cypher administration commands.
 
 To set a home database for a user, this user must exist as a record in Neo4j.
 Therefore, for deployments using xref:authentication-authorization/introduction.adoc[auth providers] other than native, you create a native user with a matching username and then set a home database for that user.
-For more information on creating native users and configuring a home database for a user, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/manage-users[Cypher Manual -> User Management].
+For more information on creating native users and configuring a home database for a user, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/manage-users[Cypher Manual -> User Management].
diff --git a/modules/ROOT/pages/manage-databases/queries.adoc b/modules/ROOT/pages/manage-databases/queries.adoc
index fcc8c9eb9..6fa261ca7 100644
--- a/modules/ROOT/pages/manage-databases/queries.adoc
+++ b/modules/ROOT/pages/manage-databases/queries.adoc
@@ -4,7 +4,7 @@
 
 [TIP]
 ====
-For detailed information on Cypher administrative commands, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/databases[Cypher Manual -> Database management].
+For detailed information on Cypher administrative commands, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases[Cypher Manual -> Database management].
 ====
 
 [NOTE]
diff --git a/modules/ROOT/pages/manage-databases/remote-alias.adoc b/modules/ROOT/pages/manage-databases/remote-alias.adoc
index 513d1b058..30c9465dd 100644
--- a/modules/ROOT/pages/manage-databases/remote-alias.adoc
+++ b/modules/ROOT/pages/manage-databases/remote-alias.adoc
@@ -6,7 +6,7 @@
 A remote database alias can be used to provide connection to one or more graphs, on one or more remote standalone servers or clusters.
 
 Although remote database aliases do not store any data, they enable users or applications to perform queries on remote databases as if they were on the local DBMS server.
-All configuration can be done with link:https://neo4j.com/docs/cypher-manual/current/databases/[Administration commands] on a running system.
+All configuration can be done with link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases[Administration commands] on a running system.
 Any changes are automatically synchronized across all instances of a cluster.
 
 The following steps describe the setup required to define a remote database alias both for local and remote DBMSs.
@@ -32,12 +32,12 @@ In the example above, _Bob_ is the administrator responsible for deciding which
 Meanwhile, _Alice_ is the administrator that assigns who has access to the privileges set by _Bob_.
 In the example, _Alice_ will assign that access to _Carol_.
 
-See link:https://neo4j.com/docs/cypher-manual/current/access-control/dbms-administration/[Cypher manual -> DBMS administration] for more information.
+See link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration[Cypher manual -> DBMS administration] for more information.
 ====
 
 _Carol_ can use her own regular credentials to access the remote database `Db1` in DBMS after _Alice_ assigns this privilege to her user profile.
 This configuration will also allow _Carol_ to access `Db2` in **DBMS B**.
-If the administrators decide this should not be the case, then _Bob_ must define the appropriate privileges (see link:https://neo4j.com/docs/cypher-manual/current/access-control/[Cypher manual -> Access control] for further information).
+If the administrators decide this should not be the case, then _Bob_ must define the appropriate privileges (see link:link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/[Cypher manual -> Access control] for further information).
 
 == Configuration of a remote DBMS (_Bob_)
 
@@ -147,7 +147,7 @@ bin/neo4j start --expand-commands
 
 == Managing remote database aliases
 
-You can use the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/aliases[alias commands] to manage remote database aliases.
+You can use the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/aliases[alias commands] to manage remote database aliases.
 In this case, it is strongly recommended to connect to a remote database alias with a secured connection.
 
 Please note that only client-side SSL is supported.
@@ -161,8 +161,8 @@ For example, the following command can be used to create a remote database alias
 CREATE ALIAS `remote-neo4j` FOR DATABASE `neo4j` AT "neo4j+s://location:7687" USER alice PASSWORD 'secretpassword'
 ----
 
-In order to do so, either link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-dbms-administration-database-management[database management]
-or link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-dbms-administration-alias-management[alias management] privileges are required.
+In order to do so, either link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-dbms-administration-database-management[database management]
+or link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-dbms-administration-alias-management[alias management] privileges are required.
 The permission to create an alias can be granted like this:
 
 [source, Cypher]
@@ -170,7 +170,7 @@ The permission to create an alias can be granted like this:
 GRANT CREATE ALIAS ON DBMS TO administrator
 ----
 
-Here is how to grant the link:https://neo4j.com/docs/cypher-manual/current/access-control/database-administration/#access-control-database-administration-access[`ACCESS` privileges] to use the remote database alias:
+Here is how to grant the link:link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/database-administration#access-control-database-administration-access[`ACCESS` privileges] to use the remote database alias:
 
 [source, Cypher]
 ----
@@ -208,7 +208,7 @@ USE `remote-neo4j` MATCH (n) RETURN *
 
 * Connecting to a remote database alias as a home database.
 This needs to be set by Administrator A.
-See more about link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-dbms-administration-user-management[User Management].
+See more about link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-dbms-administration-user-management[User Management].
 
 [source, Cypher]
 ----
diff --git a/modules/ROOT/pages/monitoring/query-management.adoc b/modules/ROOT/pages/monitoring/query-management.adoc
index edfae2c3a..7e2746a0b 100644
--- a/modules/ROOT/pages/monitoring/query-management.adoc
+++ b/modules/ROOT/pages/monitoring/query-management.adoc
@@ -68,7 +68,7 @@ CALL dbms.listActiveLocks( "query-614" )
 Queries are terminated by terminating the transaction on which they are running. This is done using the `TERMINATE TRANSACTIONS transactionIds` command.
 The `transactionIds` can be found using the link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/clauses/transaction-clauses#query-listing-transactions[`SHOW TRANSACTIONS` command].
 
-The link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/database-administration#access-control-database-administration-transaction[`TERMINATE TRANSACTION` privilege] determines what transactions can be terminated.
+The link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/database-administration#access-control-database-administration-transaction[`TERMINATE TRANSACTION` privilege] determines what transactions can be terminated.
 However, the xref:authentication-authorization/terminology.adoc#term-current-user[current user] can always terminate all of their own transactions.
 
 *Syntax:*
diff --git a/modules/ROOT/pages/monitoring/transaction-management.adoc b/modules/ROOT/pages/monitoring/transaction-management.adoc
index 010d55efe..feb21a057 100644
--- a/modules/ROOT/pages/monitoring/transaction-management.adoc
+++ b/modules/ROOT/pages/monitoring/transaction-management.adoc
@@ -51,7 +51,7 @@ db.lock.acquisition.timeout=10s
 
 To list the currently running transactions within an instance, use the `SHOW TRANSACTIONS` command.
 
-The link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/database-administration#access-control-database-administration-transaction[`SHOW TRANSACTION` privilege] determines what transactions are returned by the command.
+The link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/database-administration#access-control-database-administration-transaction[`SHOW TRANSACTION` privilege] determines what transactions are returned by the command.
 However, the xref:authentication-authorization/terminology.adoc#term-current-user[current user] can always view all of their own currently executing transactions.
 
 *Syntax:*
diff --git a/modules/ROOT/pages/reference/procedures.adoc b/modules/ROOT/pages/reference/procedures.adoc
index 0faf6ae61..c40bff2e6 100644
--- a/modules/ROOT/pages/reference/procedures.adoc
+++ b/modules/ROOT/pages/reference/procedures.adoc
@@ -25,7 +25,7 @@ SHOW PROCEDURES
 Some procedures can only be run by users with `Admin` privileges.
 These are labeled with label:admin-only[].
 
-For more information, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/manage-privileges/[Cypher Manual -> Manage Privileges].
+For more information, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/manage-privileges/[Cypher Manual -> Manage Privileges].
 ====
 
 == List of procedures
@@ -780,7 +780,7 @@ m|SCHEMA
 // m|architect, admin
 | Replaced by
 a|`CREATE CONSTRAINT ... IS NODE KEY`.
-For more information, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/database-administration[Database administration].
+For more information, see link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/database-administration[Database administration].
 |===
 
 
diff --git a/modules/ROOT/pages/routing-decisions.adoc b/modules/ROOT/pages/routing-decisions.adoc
index 7fd699746..d34ee5e36 100644
--- a/modules/ROOT/pages/routing-decisions.adoc
+++ b/modules/ROOT/pages/routing-decisions.adoc
@@ -15,7 +15,7 @@ Before the query is executed, these are the decisions taken during query routing
 Step 1: Determine the name of the target database::
    Pick the first of these that has a value:
 . link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/clauses/use[Cypher `USE` clause]
-** Note that link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/databases[administration commands]  implicitly have `USE system`.
+** Note that link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/databases[administration commands]  implicitly have `USE system`.
 . link:{neo4j-docs-base-uri}/drivers-apis/[Driver session database]
 . xref:manage-databases/introduction.adoc#manage-databases-default[Home or default database]
 Step 2: Reuse open transaction::
diff --git a/modules/ROOT/pages/tutorial/tutorial-immutable-privileges.adoc b/modules/ROOT/pages/tutorial/tutorial-immutable-privileges.adoc
index 3fd65aaf5..d9cb87838 100644
--- a/modules/ROOT/pages/tutorial/tutorial-immutable-privileges.adoc
+++ b/modules/ROOT/pages/tutorial/tutorial-immutable-privileges.adoc
@@ -4,9 +4,9 @@
 :description: This tutorial describes methods for administering immutable privileges. 
 
 This tutorial describes how to administer immutable privileges, which are useful assets for restricting the actions of users who themselves are able to administer privileges.
-They offer a way to prevent such users from simply removing any restrictions by using their link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-dbms-administration-privilege-management[privilege management] privileges.
+They offer a way to prevent such users from simply removing any restrictions by using their link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-dbms-administration-privilege-management[privilege management] privileges.
 
-In other words, having  link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/access-control/dbms-administration#access-control-dbms-administration-privilege-management[privilege management] privileges is not sufficient to add or remove immutable privileges.
+In other words, having  link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/administration/access-control/dbms-administration#access-control-dbms-administration-privilege-management[privilege management] privileges is not sufficient to add or remove immutable privileges.
 The only way immutable privileges can be added or removed is when auth is disabled.
 
 [CAUTION]