diff --git a/ui/src/components/CommentThread.tsx b/ui/src/components/CommentThread.tsx
index 328bf906caa..08f6a0203a7 100644
--- a/ui/src/components/CommentThread.tsx
+++ b/ui/src/components/CommentThread.tsx
@@ -659,7 +659,7 @@ const TimelineList = memo(function TimelineList({
                           environment's name and the Provider entry below already
                           identify it; other drivers (ssh, local) remain useful. */}
                       {run.environment.driver !== "sandbox" ? (
-                        <span> · {run.environment.driver}</span>
+                        <span> · {run.environment.driver === "computer" ? "Boat" : run.environment.driver}</span>
                       ) : null}
                     </span>
                   ) : null}
diff --git a/ui/src/lib/managed-sandbox-environment.ts b/ui/src/lib/managed-sandbox-environment.ts
index e1681c274da..0c7f72496bc 100644
--- a/ui/src/lib/managed-sandbox-environment.ts
+++ b/ui/src/lib/managed-sandbox-environment.ts
@@ -24,7 +24,7 @@ export function environmentDisplayLabel(
   environment: Pick<Environment, "name" | "driver" | "metadata">,
 ): string {
   if (isPlatformManagedEnvironment(environment)) return environment.name;
-  return `${environment.name} · ${environment.driver}`;
+  return `${environment.name} · ${environment.driver === "computer" ? "Boat" : environment.driver}`;
 }
 
 /**
diff --git a/ui/src/pages/Agents.production.tsx b/ui/src/pages/Agents.production.tsx
index 8c20e535e5c..e622b507f52 100644
--- a/ui/src/pages/Agents.production.tsx
+++ b/ui/src/pages/Agents.production.tsx
@@ -109,6 +109,7 @@ function getConfiguredModel(agent: Agent): string | null {
 
 function formatEnvironmentDriver(driver: Environment["driver"]): string {
   if (driver === "ssh") return "SSH";
+  if (driver === "computer") return "Boat";
   return driver.charAt(0).toUpperCase() + driver.slice(1);
 }
 
diff --git a/ui/src/pages/Agents.tsx b/ui/src/pages/Agents.tsx
index bbf192c674f..0d08e41ec9f 100644
--- a/ui/src/pages/Agents.tsx
+++ b/ui/src/pages/Agents.tsx
@@ -112,6 +112,7 @@ function getConfiguredModel(agent: Agent): string | null {
 
 function formatEnvironmentDriver(driver: Environment["driver"]): string {
   if (driver === "ssh") return "SSH";
+  if (driver === "computer") return "Boat";
   return driver.charAt(0).toUpperCase() + driver.slice(1);
 }
 
diff --git a/ui/src/pages/CompanyEnvironments.tsx b/ui/src/pages/CompanyEnvironments.tsx
index 86d77a1e662..673436ca2c6 100644
--- a/ui/src/pages/CompanyEnvironments.tsx
+++ b/ui/src/pages/CompanyEnvironments.tsx
@@ -2613,12 +2613,12 @@ export function CompanyEnvironments({ mode = "list" }: CompanyEnvironmentsProps)
                         >
                           <option value="">
                             Default: {instanceDefaultEnvironment
-                              ? `${instanceDefaultEnvironment.name} · ${instanceDefaultEnvironment.driver}`
+                              ? environmentDisplayLabel(instanceDefaultEnvironment)
                               : "Local"}
                           </option>
                           {reassignTargetEnvironments.map((environment) => (
                             <option key={environment.id} value={environment.id}>
-                              {environment.name} · {environment.driver}
+                              {environmentDisplayLabel(environment)}
                             </option>
                           ))}
                         </select>