diff --git a/guides/security/cap-users.md b/guides/security/cap-users.md
index 599467b0e..a82fcf134 100644
--- a/guides/security/cap-users.md
+++ b/guides/security/cap-users.md
@@ -1191,7 +1191,7 @@ Depending on the configured [authentication](./authentication) strategy, CAP der
 | User Property | UserInfo Getter                         | XSUAA JWT Property          | IAS JWT Property          | `@restrict`-annotation |
 |---------------|-----------------------------------------|-----------------------------|---------------------------|------------------------|
 | _Logon name_  | `getName()`                             | `user_name`                 | `sub`                     | `$user`                |
-| _Tenant_      | `getTenant()`                           | `zid`                       | `app_tid`                 | `$user.tenant`         |
+| _Tenant_      | `getTenant()`                           | `zid`                       | `app_tid`                 | `$tenant`         |
 | _Attributes_  | `getAttributeValues(String attr)`       | `xs.user.attributes.<attr>` | _All non-meta attributes_ | `$user.<attr>`         |
 | _Roles_       | `getRoles()` and `hasRole(String role)` | `scopes`                    | _n/a - injected via AMS_  | _String in `to`-clause_  |
 
@@ -1242,7 +1242,7 @@ Depending on the configured [authentication](./authentication) strategy, CAP der
 | User Property | UserInfo Getter                     | XSUAA JWT Property          | IAS JWT Property        | `@restrict`-annotation |
 |---------------|-------------------------------------|-----------------------------|-------------------------|------------------------|
 | _Logon name_  | `user.id`                           | `user_name`                 | `sub`                   | `$user`                |
-| _Tenant_      | `req.tenant` / `cds.context.tenant` | `zid`                       | `app_tid`               | `$user.tenant`         |
+| _Tenant_      | `req.tenant` / `cds.context.tenant` | `zid`                       | `app_tid`               | `$tenant`         |
 | _Attributes_  | `attr(attr)`                        | `xs.user.attributes.<attr>` | All non-meta attributes | `$user.<attr>`         |
 | _Roles_       | `is(role)`                          | `scopes`                    | n/a - injected via AMS  | String in `to`-clause  |
 
diff --git a/java/developing-applications/building.md b/java/developing-applications/building.md
index 29853ec9a..e476a17b2 100644
--- a/java/developing-applications/building.md
+++ b/java/developing-applications/building.md
@@ -258,7 +258,6 @@ CAP Java comes with a rich set of prepared modules for all different layers of t
 * `cds-feature-jdbc`: Consuming JDBC persistences using the CDS4j JDBC runtime.
 * `cds-feature-hana`:  Makes your application aware of SAP HANA data sources.
 * `cds-feature-postgresql`: Makes your application aware of PostgreSQL data sources.
-* `cds-feature-xsuaa`:  Adds [XSUAA](https://github.com/SAP/cloud-security-xsuaa-integration)-based authentication to your application.
 * `cds-feature-identity`: Adds [Identity Services](https://github.com/SAP/cloud-security-xsuaa-integration) integration covering IAS to your application.
 * `cds-feature-mt`:  Makes your application multitenant aware.
 * `cds-feature-enterprise-messaging`:  Connects your application to SAP Event Mesh.
diff --git a/java/operating-applications/observability.md b/java/operating-applications/observability.md
index b88a3fd9e..69a3fc7e2 100644
--- a/java/operating-applications/observability.md
+++ b/java/operating-applications/observability.md
@@ -664,7 +664,7 @@ CAP Java SDK plugs a CDS-specific actuator `cds`. This actuator provides informa
 - The version and commit ID of the currently used `cds-services` library
 - All services registered in the service catalog
 - Security configuration (authentication type and so on)
-- Loaded features such as `cds-feature-xsuaa`
+- Loaded features such as `cds-feature-identity`
 - Database pool statistics (requires `registerMbeans: true` in [Hikari pool configuration](../cqn-services/persistence-services#datasource-configuration))
 
 
diff --git a/tools/cds-cli.md b/tools/cds-cli.md
index bb77658b7..18161f609 100644
--- a/tools/cds-cli.md
+++ b/tools/cds-cli.md
@@ -120,8 +120,8 @@ The facets built into `@sap/cds-dk` provide you with a large set of standard fea
 | `mta`                         |       <X/>       |       <X/>       |
 | `cf-manifest`                 |       <X/>       |       <X/>       |
 | `helm`                        |       <X/>       |       <X/>       |
-| `helm-unified-runtime`        |       <X/>       |       <X/>       |
 | `containerize`                |       <X/>       |       <X/>       |
+| `kyma`                        |         <X/>       |       <X/>          |  
 | `multitenancy`                |       <X/>       |       <X/>       |
 | `toggles`                     |       <X/>       |       <X/>       |
 | `extensibility`               |       <X/>       |       <X/>       |