diff --git a/beszel/internal/agent/agent.go b/beszel/internal/agent/agent.go
index 47f34b4..cc5a08f 100644
--- a/beszel/internal/agent/agent.go
+++ b/beszel/internal/agent/agent.go
@@ -201,7 +201,7 @@ func (a *Agent) getSystemStats() (system.Info, system.Stats) {
 	// add host info
 	if info, err := host.Info(); err == nil {
 		systemInfo.Uptime = info.Uptime
-		// systemInfo.Os = info.OS
+		systemInfo.Hostname = info.Hostname
 	}
 	// add cpu stats
 	if info, err := cpu.Info(); err == nil && len(info) > 0 {
diff --git a/beszel/internal/entities/system/system.go b/beszel/internal/entities/system/system.go
index d36a915..a013169 100644
--- a/beszel/internal/entities/system/system.go
+++ b/beszel/internal/entities/system/system.go
@@ -45,6 +45,8 @@ type NetIoStats struct {
 }
 
 type Info struct {
+	Hostname string `json:"h"`
+
 	Cores    int    `json:"c"`
 	Threads  int    `json:"t"`
 	CpuModel string `json:"m"`
diff --git a/beszel/site/src/components/routes/system.tsx b/beszel/site/src/components/routes/system.tsx
index 1d6fd92..0f6f383 100644
--- a/beszel/site/src/components/routes/system.tsx
+++ b/beszel/site/src/components/routes/system.tsx
@@ -9,6 +9,7 @@ import {
 	CpuIcon,
 	GlobeIcon,
 	LayoutGridIcon,
+	MonitorIcon,
 	StretchHorizontalIcon,
 	XIcon,
 } from 'lucide-react'
@@ -255,9 +256,23 @@ export default function SystemDetail({ name }: { name: string }) {
 								<div className="flex gap-1.5 items-center">
 									<GlobeIcon className="h-4 w-4" /> {system.host}
 								</div>
+								{/* show hostname if it's different than host or name */}
+								{system.info?.h && system.info.h != system.host && system.info.h != system.name && (
+									<TooltipProvider>
+										<Tooltip delayDuration={150}>
+											<Separator orientation="vertical" className="h-4 bg-primary/30" />
+											<TooltipTrigger asChild>
+												<div className="flex gap-1.5 items-center">
+													<MonitorIcon className="h-4 w-4" /> {system.info.h}
+												</div>
+											</TooltipTrigger>
+											<TooltipContent>Hostname</TooltipContent>
+										</Tooltip>
+									</TooltipProvider>
+								)}
 								{system.info?.u && (
 									<TooltipProvider>
-										<Tooltip>
+										<Tooltip delayDuration={150}>
 											<Separator orientation="vertical" className="h-4 bg-primary/30" />
 											<TooltipTrigger asChild>
 												<div className="flex gap-1.5 items-center">
@@ -273,7 +288,7 @@ export default function SystemDetail({ name }: { name: string }) {
 										<Separator orientation="vertical" className="h-4 bg-primary/30" />
 										<div className="flex gap-1.5 items-center">
 											<CpuIcon className="h-4 w-4" />
-											{system.info.m} ({system.info.c}c / {system.info.t}t)
+											{system.info.m} ({system.info.c}c/{system.info.t}t)
 										</div>
 									</>
 								)}
diff --git a/beszel/site/src/types.d.ts b/beszel/site/src/types.d.ts
index b6c9a77..099a95c 100644
--- a/beszel/site/src/types.d.ts
+++ b/beszel/site/src/types.d.ts
@@ -10,6 +10,8 @@ export interface SystemRecord extends RecordModel {
 }
 
 export interface SystemInfo {
+	/** hostname */
+	h: string
 	/** cpu percent */
 	cpu: number
 	/** cpu threads */