diff --git a/docs/end-user-guides/instance-mapping.mdx b/docs/end-user-guides/instance-mapping.mdx
index fd8189f..ce01354 100644
--- a/docs/end-user-guides/instance-mapping.mdx
+++ b/docs/end-user-guides/instance-mapping.mdx
@@ -186,9 +186,14 @@ kubectl create -f cf-hana-instance-mapping.yaml
 
 Your SAP HANA Cloud database is now mapped to the Cloud Foundry space and applications in that space can create HDI containers in your database.
 
-If you [have a subscription to SAP HANA Cloud Administration Tools](/docs/crossplane-provider-btp/docs/end-user-guides/services/create-services#subscription), you can verify the creation of the instance mapping in the configuration of your SAP HANA Cloud instance:
+<details>
+  <summary> Optional: Verify in SAP HANA Cloud Administration Tools</summary>
 
-![Instance mapping in SAP HANA Cloud Administration Tools](/img/instance-mapping.png)
+  If you [have a subscription to SAP HANA Cloud Administration Tools](/docs/crossplane-provider-btp/docs/end-user-guides/services/create-services#subscription) and [assigned yourself](/docs/crossplane-provider-btp/docs/end-user-guides/account/usermanagement#assign-users-and-user-groups-to-role-collections-) the "SAP HANA Cloud Viewer" or "SAP HANA Cloud Administrator" role collection, you can verify the creation of the instance mapping in the configuration of your SAP HANA Cloud instance:
+
+  ![Instance mapping in SAP HANA Cloud Administration Tools](/img/instance-mapping.png)
+
+</details>
 
 ## Create an instance mapping (Kyma)
 
diff --git a/docs/end-user-guides/setup.mdx b/docs/end-user-guides/setup.mdx
index f17d7d0..e3c03b5 100644
--- a/docs/end-user-guides/setup.mdx
+++ b/docs/end-user-guides/setup.mdx
@@ -221,7 +221,7 @@ data:
   username: REJBRE1JTg== # E.g. Base64-encode: DBADMIN 
   password: Q2xvdWQtMTIzNDUh # Same password as set during service instance creation E.g. Base64-encode: Cloud-12345!
 ---
-apiVersion: objects.hana.orchestrate.cloud.sap/v1alpha1
+apiVersion: hana.sap.crossplane.io/v1alpha1
 kind: ProviderConfig
 metadata:
     name: hana-providerconfig
diff --git a/docs/end-user-guides/table.mdx b/docs/end-user-guides/table.mdx
index 4b90d4a..43c3ab3 100644
--- a/docs/end-user-guides/table.mdx
+++ b/docs/end-user-guides/table.mdx
@@ -51,7 +51,7 @@ See [full CRD reference](https://github.com/SAP/crossplane-provider-hana/tree/ma
     ```
     
     ```yaml title="user.yaml"
-    apiVersion: admin.hana.orchestrate.cloud.sap/v1alpha1
+    apiVersion: admin.hana.sap.crossplane.io/v1alpha1
     kind: User
     metadata:
       name: liquibase-user
@@ -78,7 +78,7 @@ See [full CRD reference](https://github.com/SAP/crossplane-provider-hana/tree/ma
     Next, create the changelog schema and the managed schema:
 
     ```yaml title="changelog-schema.yaml"
-    apiVersion: objects.hana.orchestrate.cloud.sap/v1alpha1
+    apiVersion: schema.hana.sap.crossplane.io/v1alpha1
     kind: DbSchema
     metadata:
       name: liquibase-changelog-schema
@@ -91,7 +91,7 @@ See [full CRD reference](https://github.com/SAP/crossplane-provider-hana/tree/ma
     ```
 
     ```yaml title="managed-schema.yaml"
-    apiVersion: schema.hana.orchestrate.cloud.sap/v1alpha1
+    apiVersion: schema.hana.sap.crossplane.io/v1alpha1
     kind: DbSchema
     metadata:
       name: liquibase-changelog-schema
diff --git a/docs/end-user-guides/users.mdx b/docs/end-user-guides/users.mdx
index 46a2f12..267af22 100644
--- a/docs/end-user-guides/users.mdx
+++ b/docs/end-user-guides/users.mdx
@@ -21,7 +21,7 @@ See [full CRD reference](https://github.com/SAP/crossplane-provider-hana/tree/ma
 We begin by provisioning a `User` resource.
 
 ```yaml title="user.yaml"
-apiVersion: admin.hana.orchestrate.cloud.sap/v1alpha1
+apiVersion: admin.hana.sap.crossplane.io/v1alpha1
 kind: User
 metadata:
   name: my-orchestrated-user
diff --git a/examples/instancemapping/kymainstancemapping-example.yaml b/examples/instancemapping/kymainstancemapping-example.yaml
index 6deaf16..de8a7a4 100644
--- a/examples/instancemapping/kymainstancemapping-example.yaml
+++ b/examples/instancemapping/kymainstancemapping-example.yaml
@@ -34,7 +34,7 @@ data:
 
 ---
 # Step 2: ProviderConfig (placeholder - admin API credentials come from Kyma cluster)
-apiVersion: hana.orchestrate.cloud.sap/v1alpha1
+apiVersion: hana.sap.crossplane.io/v1alpha1
 kind: ProviderConfig
 metadata:
   name: default
diff --git a/examples/instancemapping/kymainstancemapping-local.yaml b/examples/instancemapping/kymainstancemapping-local.yaml
index 3633139..0ac061f 100644
--- a/examples/instancemapping/kymainstancemapping-local.yaml
+++ b/examples/instancemapping/kymainstancemapping-local.yaml
@@ -11,7 +11,7 @@
 
 ---
 # Step 1: ProviderConfig (placeholder - admin API credentials come from ServiceBinding)
-apiVersion: hana.orchestrate.cloud.sap/v1alpha1
+apiVersion: hana.sap.crossplane.io/v1alpha1
 kind: ProviderConfig
 metadata:
   name: default
diff --git a/examples/instancemapping/providerconfig.yaml b/examples/instancemapping/providerconfig.yaml
index 2f66852..fe49109 100644
--- a/examples/instancemapping/providerconfig.yaml
+++ b/examples/instancemapping/providerconfig.yaml
@@ -17,7 +17,7 @@ stringData:
   endpoint: abc123-456.hanacloud.ondemand.com
   port: "443"
 ---
-apiVersion: hana.orchestrate.cloud.sap/v1alpha1
+apiVersion: hana.sap.crossplane.io/v1alpha1
 kind: ProviderConfig
 metadata:
   name: default