diff --git a/modules/ROOT/content-nav.adoc b/modules/ROOT/content-nav.adoc
index c640c7f0d..306766b30 100644
--- a/modules/ROOT/content-nav.adoc
+++ b/modules/ROOT/content-nav.adoc
@@ -30,6 +30,7 @@ Generic Start
 ** xref:managing-instances/regions.adoc[Regions]
 ** xref:managing-instances/backup-restore-export.adoc[Backup, export, and restore]
 ** xref:managing-instances/vector-optimization.adoc[Vector optimization]
+** xref:managing-instances/cypher-version.adoc[Cypher version]
 
 
 * Import data
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 7c2bc9f31..1e645fb58 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -34,7 +34,7 @@ Aura offers the following products and tiers:
 ** AuraDS
 ** Aura Graph Analytics
 
-*Tiers and subscription plans:*
+*Tiers:*
 
 ** AuraDB Free
 ** AuraDB Professional
diff --git a/modules/ROOT/pages/managing-instances/cypher-version.adoc b/modules/ROOT/pages/managing-instances/cypher-version.adoc
new file mode 100644
index 000000000..d0c440f3d
--- /dev/null
+++ b/modules/ROOT/pages/managing-instances/cypher-version.adoc
@@ -0,0 +1,16 @@
+= Cypher version
+:description: This page describes how to set the default Cypher version for a database.
+
+Neo4j supports two Cypher versions, *Cypher 5* and *Cypher 25*.
+
+No new features are added to Cypher 5: it receives only performance and security updates, as well as eventual bug fixes.
+This is the current default query language.
+
+All new features are added to Cypher 25, which will eventually become the default language for new instances.
+
+To make use of new features and functionality, you need to change the default language.
+This is managed per Aura instance and requires an `ADMIN` role.
+It is done using the `ALTER DATABASE` command and thus affects all queries executed against your database.
+However, you can also override the default language for individual queries.
+
+For more information about Cypher versions and commands, see link:{neo4j-docs-base-uri}/cypher-manual/25/queries/select-version/[Cypher Manual -> Select Cypher version].
diff --git a/modules/ROOT/pages/user-management.adoc b/modules/ROOT/pages/user-management.adoc
index 31fc44071..1f5b15764 100644
--- a/modules/ROOT/pages/user-management.adoc
+++ b/modules/ROOT/pages/user-management.adoc
@@ -22,9 +22,9 @@ Roles at the organization level determine what administrative capabilities a use
 
 The following roles are available at the org level:
 
-* Owner
-* Admin
-* Member
+* `ORG_OWNER`
+* `ORG_ADMIN`
+* `ORG_MEMBER`
 
 :check-mark: icon:check[]
 .Roles and organization capabilities
@@ -146,10 +146,10 @@ The following roles are available at the org level:
 
 Users within a project can be assigned one of the following roles:
 
-* _Project Viewer_
-* _Metrics Reader_
-* _Project Member_
-* _Project Admin_
+* `PROJECT_VIEWER`
+* `METRICS READER`
+* `PROJECT_MEMBER`
+* `PROJECT_ADMIN`
 
 [NOTE]
 ====
@@ -158,12 +158,12 @@ Each project must have at least one Project Admin, but it is also possible for p
 
 === Metrics reader role
 
-The `metrics reader` role can be assigned to any user or service account.
-It has the same permissions as the `project viewer` role, but with some extra permissions specifically for reading metrics via an API endpoint.
+The `METRICS_READER` role can be assigned to any user or service account.
+It has the same permissions as the `PROJECT_VIEWER` role, but with some extra permissions specifically for reading metrics via an API endpoint.
 The role allows access to metrics for all instances in a project.
-Accessing metric endpoints requires xref:/api/authentication.adoc[Aura API Credentials] and the `metrics reader` role enables the creation of these credentials.
+Accessing metric endpoints requires xref:/api/authentication.adoc[Aura API Credentials] and the `METRICS_READER` role enables the creation of these credentials.
 
-The `metrics reader` role can view and open instances in the console, however, login to the instance is required to interact with it, with access to Explore and Query defined by the instance’s RBAC settings.
+The `METRICS_READER` role can view and open instances in the console, however, login to the instance is required to interact with it, with access to Explore and Query defined by the instance’s RBAC settings.
 
 :check-mark: icon:check[]
 
@@ -172,7 +172,7 @@ The `metrics reader` role can view and open instances in the console, however, l
 |===
 | Capability
 | Project Viewer
-| Metrics reader
+| Metrics Reader
 | Member
 | Admin