diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3db8e3375c184e..29a2fcd8ff671c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,8 @@
     <file type="web" url="file://$PROJECT_DIR$/components/gitpod-protocol/java" />
     <file type="web" url="file://$PROJECT_DIR$/components/ide/jetbrains/backend-plugin" />
     <file type="web" url="file://$PROJECT_DIR$/components/ide/jetbrains/gateway-plugin" />
+    <file type="web" url="file://$PROJECT_DIR$/components/public-api/java" />
     <file type="web" url="file://$PROJECT_DIR$/components/supervisor-api/java" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" project-jdk-name="zulu-21" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" project-jdk-name="zulu-17" project-jdk-type="JavaSDK" />
+</project>
diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodCLIService.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodCLIService.kt
index e4bd69c3efca77..4af7fcd2f13cc7 100644
--- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodCLIService.kt
+++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodCLIService.kt
@@ -5,6 +5,7 @@
 package io.gitpod.jetbrains.remote
 
 import com.intellij.codeWithMe.ClientId
+import com.intellij.codeWithMe.asContextElement
 import com.intellij.ide.BrowserUtil
 import com.intellij.ide.CommandLineProcessor
 import com.intellij.openapi.client.ClientKind
@@ -27,10 +28,7 @@ import io.netty.channel.ChannelHandlerContext
 import io.netty.handler.codec.http.FullHttpRequest
 import io.netty.handler.codec.http.QueryStringDecoder
 import io.prometheus.client.exporter.common.TextFormat
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.*
 import org.jetbrains.ide.RestService
 import org.jetbrains.io.response
 import java.io.OutputStreamWriter
@@ -113,14 +111,12 @@ class GitpodCLIService : RestService() {
     }
 
     private fun withClient(request: FullHttpRequest, context: ChannelHandlerContext, action: suspend (project: Project?) -> Unit): String? {
-        GlobalScope.launch {
-            getClientSessionAndProjectAsync().let { (session, project) ->
-                ClientId.withClientId(session.clientId) {
-                    runBlocking {
-                        action(project)
-                    }
-                    sendOk(request, context)
-                }
+        val scope = CoroutineScope(Dispatchers.Default)
+        scope.launch {
+            val (session, project) = getClientSessionAndProjectAsync()
+            withContext(session.clientId.asContextElement()) {
+                action(project)
+                sendOk(request, context)
             }
         }
         return null