diff --git a/components/server/src/workspace/gitpod-server-impl.ts b/components/server/src/workspace/gitpod-server-impl.ts
index 36598def37b340..cce5dd31029878 100644
--- a/components/server/src/workspace/gitpod-server-impl.ts
+++ b/components/server/src/workspace/gitpod-server-impl.ts
@@ -1575,12 +1575,14 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
         const logInfo = instance.imageBuildInfo?.log;
         if (!logInfo) {
+            const teams = await this.teamDB.findTeamsByUser(user.id);
             const isOldImageBuildLogsMechanismDeprecated = await getExperimentsClientForBackend().getValueAsync(
                 "deprecateOldImageLogsMechanism",
                 false,
                 {
                     userId: user.id,
                     projectId: workspace.projectId,
+                    teams,
                 },
             );
             if (isOldImageBuildLogsMechanismDeprecated) {
@@ -3211,15 +3213,22 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
      * @returns
      */
     protected async getImageBuilderClient(user: User, workspace: Workspace, instance?: WorkspaceInstance) {
+        const teams = await this.teamDB.findTeamsByUser(user.id);
         const isMovedImageBuilder = await getExperimentsClientForBackend().getValueAsync("movedImageBuilder", false, {
             userId: user.id,
             projectId: workspace.projectId,
+            teams,
         });
+        log.info(
+            { userId: user.id, workspaceId: workspace.id, instanceId: instance?.id },
+            "image-builder in workspace cluster?",
+            {
+                userId: user.id,
+                projectId: workspace.projectId,
+                isMovedImageBuilder,
+            },
+        );
         if (isMovedImageBuilder) {
-            log.info(
-                { userId: user.id, workspaceId: workspace.id, instanceId: instance?.id },
-                "Used image-builder in workspace cluster",
-            );
             return this.wsClusterImageBuilderClientProvider.getClient(user, workspace, instance);
         } else {
             return this.imagebuilderClientProvider.getClient(user, workspace, instance);
diff --git a/components/server/src/workspace/workspace-starter.ts b/components/server/src/workspace/workspace-starter.ts
index a4e2f416aa06e8..606eafbb4fb35c 100644
--- a/components/server/src/workspace/workspace-starter.ts
+++ b/components/server/src/workspace/workspace-starter.ts
@@ -19,6 +19,7 @@ import {
     DBUser,
     DBWithTracing,
     ProjectDB,
+    TeamDB,
     TracedUserDB,
     TracedWorkspaceDB,
     UserDB,
@@ -208,6 +209,7 @@ export class WorkspaceStarter {
     @inject(ProjectDB) protected readonly projectDB: ProjectDB;
     @inject(ContextParser) protected contextParser: ContextParser;
     @inject(BlockedRepositoryDB) protected readonly blockedRepositoryDB: BlockedRepositoryDB;
+    @inject(TeamDB) protected readonly teamDB: TeamDB;
 
     public async startWorkspace(
         ctx: TraceContext,
@@ -1724,15 +1726,22 @@ export class WorkspaceStarter {
      * @returns
      */
     protected async getImageBuilderClient(user: User, workspace: Workspace, instance?: WorkspaceInstance) {
+        const teams = await this.teamDB.findTeamsByUser(user.id);
         const isMovedImageBuilder = await getExperimentsClientForBackend().getValueAsync("movedImageBuilder", false, {
             userId: user.id,
             projectId: workspace.projectId,
+            teams,
         });
+        log.info(
+            { userId: user.id, workspaceId: workspace.id, instanceId: instance?.id },
+            "image-builder in workspace cluster?",
+            {
+                userId: user.id,
+                projectId: workspace.projectId,
+                isMovedImageBuilder,
+            },
+        );
         if (isMovedImageBuilder) {
-            log.info(
-                { userId: user.id, workspaceId: workspace.id, instanceId: instance?.id },
-                "Used image-builder in workspace cluster",
-            );
             return this.wsClusterImageBuilderClientProvider.getClient(user, workspace, instance);
         } else {
             return this.imagebuilderClientProvider.getClient(user, workspace, instance);