diff --git a/server/internal/daemon/daemon.go b/server/internal/daemon/daemon.go
index cb07e55f..a25eea95 100644
--- a/server/internal/daemon/daemon.go
+++ b/server/internal/daemon/daemon.go
@@ -210,8 +210,12 @@ func (d *Daemon) registerRuntimesForWorkspace(ctx context.Context, workspaceID s
 			d.logger.Warn("skip registering runtime", "name", name, "error", err)
 			continue
 		}
+		displayName := strings.ToUpper(name[:1]) + name[1:]
+		if d.cfg.DeviceName != "" {
+			displayName = fmt.Sprintf("%s (%s)", displayName, d.cfg.DeviceName)
+		}
 		runtimes = append(runtimes, map[string]string{
-			"name":    fmt.Sprintf("Local %s", strings.ToUpper(name[:1])+name[1:]),
+			"name":    displayName,
 			"type":    name,
 			"version": version,
 			"status":  "online",