diff --git a/versioned_docs/version-8.7/apis-tools/spring-zeebe-sdk/configuration.md b/versioned_docs/version-8.7/apis-tools/spring-zeebe-sdk/configuration.md
index e29912f7e64..223312a53eb 100644
--- a/versioned_docs/version-8.7/apis-tools/spring-zeebe-sdk/configuration.md
+++ b/versioned_docs/version-8.7/apis-tools/spring-zeebe-sdk/configuration.md
@@ -554,9 +554,19 @@ When using multi-tenancy, the Zeebe client will connect to the `<default>` tenan
 ```yaml
 camunda:
   client:
-    tenant-ids:
-      - <default>
-      - foo
+    tenant-id: foo
+```
+
+To control which tenants your job workers should use, you can configure:
+
+```yaml
+camunda:
+  client:
+    zeebe:
+      defaults:
+        tenant-ids:
+          - <default>
+          - foo
 ```
 
 Additionally, you can set tenant ids on job worker level by using the annotation:
diff --git a/versioned_docs/version-8.7/apis-tools/spring-zeebe-sdk/getting-started.md b/versioned_docs/version-8.7/apis-tools/spring-zeebe-sdk/getting-started.md
index 1ec1997f3d5..5da8b336dda 100644
--- a/versioned_docs/version-8.7/apis-tools/spring-zeebe-sdk/getting-started.md
+++ b/versioned_docs/version-8.7/apis-tools/spring-zeebe-sdk/getting-started.md
@@ -82,8 +82,9 @@ camunda:
     auth:
       client-id: <your client id>
       client-secret: <your client secret>
-    cluster-id: <your cluster id>
-    region: <your cluster region id>
+    cloud:
+      cluster-id: <your cluster id>
+      region: <your cluster region id>
 ```
 
 ### Self-Managed
@@ -97,7 +98,7 @@ camunda:
     auth:
       client-id: <your client id>
       client-secret: <your client secret>
-      issuer: http://localhost:18080/auth/realms/camunda-platform/protocol/openid-connect/token
+      token-url: http://localhost:18080/auth/realms/camunda-platform/protocol/openid-connect/token
 ```
 
 If you have different endpoints for your applications or want to disable a client, configure the following:
@@ -106,12 +107,11 @@ If you have different endpoints for your applications or want to disable a clien
 camunda:
   client:
     mode: self-managed
-    tenant-ids:
-      - <default>
+    tenant-id: <default>
     auth:
       client-id: <your client id>
       client-secret: <your client secret>
-      issuer: http://localhost:18080/auth/realms/camunda-platform/protocol/openid-connect/token
+      token-url: http://localhost:18080/auth/realms/camunda-platform/protocol/openid-connect/token
     zeebe:
       enabled: true
       grpc-address: http://localhost:26500