diff --git a/antora.yml b/antora.yml
index 356ec31..622621d 100644
--- a/antora.yml
+++ b/antora.yml
@@ -29,4 +29,8 @@ asciidoc:
     cql: 'Cassandra Query Language (CQL)'
     cql-shell: 'CQL shell'
     cql-console: 'CQL console'
-    pulsar-short: 'Pulsar'
\ No newline at end of file
+    pulsar-short: 'Pulsar'
+
+    # Astra role attributes (compare with astra-vector-docs antora.yml)
+    organization-administrator-role: 'xref:astra-db-serverless:administration:rbac.adoc#organization-administrator-role[Organization Administrator]'
+    database-administrator-role: 'xref:astra-db-serverless:administration:rbac.adoc#database-administrator-role[Database Administrator]'
\ No newline at end of file
diff --git a/in-progress/administration.adoc b/in-progress/administration.adoc
index 7456435..a7da4c7 100644
--- a/in-progress/administration.adoc
+++ b/in-progress/administration.adoc
@@ -131,7 +131,7 @@ astra user invite **USER_EMAIL**
 
 [IMPORTANT]
 ====
-If you don't specify a role when inviting a user, the user is automatically assigned the default role of `Database Administrator`.
+If you don't specify a role when inviting a user, the user is automatically assigned the default role of {database-administrator-role}.
 ====
 
 === `user invite` options
@@ -200,7 +200,7 @@ Replace the following:
 * `**ROLE**`: The name or ID of the role you want to assign to the user.
 To get a list of the available roles in your organization, see <<list-roles>>.
 
-For example, to invite a user with the `Organization Administrator` role:
+For example, to invite a user with the {organization-administrator-role} role:
 
 [source,bash]
 ----
diff --git a/in-progress/quickstart-databases.adoc b/in-progress/quickstart-databases.adoc
index 7179a10..9c812e9 100644
--- a/in-progress/quickstart-databases.adoc
+++ b/in-progress/quickstart-databases.adoc
@@ -1,8 +1,6 @@
 // Writer's note: This page contains a selection of content that was deleted from the Astra Serverless docs. We should retain relevant content reformat it for Astra CLI 1.0.
 = Manage databases with the {product}
 :navtitle: Quickstart for databases
-:organization-administrator-role: pass:q[xref:astra-db-serverless:administration:rbac.adoc#organization-administrator-role[*Organization Administrator*]]
-:database-administrator-role: pass:q[xref:astra-db-serverless:administration:rbac.adoc#database-administrator-role[*Database Administrator*]]
 
 You can use the {product} to perform administrative operations on your {astra-db} databases and keyspaces.
 
diff --git a/modules/ROOT/pages/manage-cli.adoc b/modules/ROOT/pages/manage-cli.adoc
index ae99dfe..f45f1ff 100644
--- a/modules/ROOT/pages/manage-cli.adoc
+++ b/modules/ROOT/pages/manage-cli.adoc
@@ -24,7 +24,7 @@ xref:astra-db-serverless:administration:manage-application-tokens.adoc#org-token
 [TIP]
 ====
 If this is your first time using the {product}, {company} recommends that you connect to a non-production organization first.
-That way, you can assign your application token a more expansive role, such as *Organization Administrator*, so that you can try out all of the {product}'s features without putting production data at risk.
+That way, you can assign your application token a more expansive role, such as {organization-administrator-role}, so that you can try out all of the {product}'s features without putting production data at risk.
 
 If you're using the {product} in production, {company} strongly recommends that you follow the principle of least privilege: Make sure your application token's role provides only the minimum required permissions.
 For example, don't grant an administrator-level role to a token that won't be used to execute those types of commands.