diff --git a/packages/core/src/shared/vscode/env.ts b/packages/core/src/shared/vscode/env.ts
index 5ee891cc7d3..abd9c58ae2d 100644
--- a/packages/core/src/shared/vscode/env.ts
+++ b/packages/core/src/shared/vscode/env.ts
@@ -307,6 +307,15 @@ export async function getMachineId(): Promise<string> {
         // TODO: use `vscode.env.machineId` instead?
         return 'browser'
     }
+    // Eclipse Che-based envs (backing compute rotates, not classified as a web instance)
+    // TODO: use `vscode.env.machineId` instead?
+    if (process.env.CHE_WORKSPACE_ID) {
+        return process.env.CHE_WORKSPACE_ID
+    }
+    // RedHat Dev Workspaces (run some VSC web variant)
+    if (process.env.DEVWORKSPACE_ID) {
+        return process.env.DEVWORKSPACE_ID
+    }
     const proc = new ChildProcess('hostname', [], { collect: true, logging: 'no' })
     // TODO: check exit code.
     return (await proc.run()).stdout.trim() ?? 'unknown-host'