diff --git a/metrics_agentpool.go b/metrics_agentpool.go
index 954a104..612f51c 100644
--- a/metrics_agentpool.go
+++ b/metrics_agentpool.go
@@ -77,7 +77,7 @@ func (m *MetricsCollectorAgentPool) Setup(collector *collector.Collector) {
 			"provisioningState",
 			"maxParallelism",
 			"agentPoolAgentOs",
-			"agentPoolAgentComputerName",
+			"agentPoolAgentSystemCapabilities",
 			"enabled",
 			"status",
 			"hasAssignedRequest",
@@ -184,11 +184,6 @@ func (m *MetricsCollectorAgentPool) collectAgentQueues(ctx context.Context, logg
 	for _, agentPoolAgent := range list.List {
 		agentPoolSize++
 
-		agentComputerName := ""
-		if val, exists := agentPoolAgent.SystemCapabilities["Agent.ComputerName"]; exists {
-			agentComputerName = val
-		}
-
 		infoLabels := prometheus.Labels{
 			"agentPoolID":                int64ToString(agentPoolId),
 			"agentPoolAgentID":           int64ToString(agentPoolAgent.Id),
@@ -197,7 +192,7 @@ func (m *MetricsCollectorAgentPool) collectAgentQueues(ctx context.Context, logg
 			"provisioningState":          agentPoolAgent.ProvisioningState,
 			"maxParallelism":             int64ToString(agentPoolAgent.MaxParallelism),
 			"agentPoolAgentOs":           agentPoolAgent.OsDescription,
-			"agentPoolAgentComputerName": agentComputerName,
+			"agentPoolAgentSystemCapabilities": agentPoolAgent.SystemCapabilities,
 			"enabled":                    to.BoolString(agentPoolAgent.Enabled),
 			"status":                     agentPoolAgent.Status,
 			"hasAssignedRequest":         to.BoolString(agentPoolAgent.AssignedRequest.RequestId > 0),