diff --git a/app/lib/index.js b/app/lib/index.js
index 695403031..547243eb5 100644
--- a/app/lib/index.js
+++ b/app/lib/index.js
@@ -22,7 +22,7 @@ const path = require('path');
 
 const fs = require('fs');
 
-const Camunda8 = require('@camunda8/sdk');
+const { Camunda8 } = require('@camunda8/sdk');
 
 const Cli = require('./cli');
 const Config = require('./config');
@@ -680,7 +680,7 @@ function bootstrap() {
   errorTracking.setTag(Sentry, 'plugins', generatePluginsTag(plugins));
 
   // (9) zeebe API
-  const zeebeAPI = new ZeebeAPI({ readFile }, Camunda8.ZeebeGrpcApiClient, flags);
+  const zeebeAPI = new ZeebeAPI({ readFile }, Camunda8, flags);
 
   return {
     config,
diff --git a/app/lib/zeebe-api/zeebe-api.js b/app/lib/zeebe-api/zeebe-api.js
index 7feafb000..4b9b5444b 100644
--- a/app/lib/zeebe-api/zeebe-api.js
+++ b/app/lib/zeebe-api/zeebe-api.js
@@ -90,10 +90,10 @@ const RESOURCE_TYPES = {
  */
 
 class ZeebeAPI {
-  constructor(fs, ZeebeGrpcApiClient, flags, log = createLog('app:zeebe-api')) {
+  constructor(fs, Camunda8, flags, log = createLog('app:zeebe-api')) {
     this._fs = fs;
 
-    this._ZeebeGrpcApiClient = ZeebeGrpcApiClient;
+    this._Camunda8 = Camunda8;
     this._flags = flags;
     this._log = log;
 
@@ -355,7 +355,7 @@ class ZeebeAPI {
       ])
     });
 
-    return new this._ZeebeGrpcApiClient({ config: options });
+    return (new this._Camunda8(options)).getZeebeGrpcApiClient();
   }
 
   async _withTLSConfig(url, options) {