diff --git a/internal/controllers/services.go b/internal/controllers/services.go
index 4f402e83..5be4c1ac 100644
--- a/internal/controllers/services.go
+++ b/internal/controllers/services.go
@@ -190,7 +190,7 @@ func configureAgentService(cr *model.CryostatInstance) *operatorv1beta2.AgentSer
 	}
 
 	// Apply common service defaults
-	configureService(&config.ServiceConfig, cr.Name, "cryostat")
+	configureService(&config.ServiceConfig, cr.Name, "cryostat-agent-gateway")
 
 	// Apply default HTTP port if not provided
 	if config.HTTPPort == nil {
diff --git a/internal/test/resources.go b/internal/test/resources.go
index 015dd385..bc74bc9f 100644
--- a/internal/test/resources.go
+++ b/internal/test/resources.go
@@ -830,10 +830,10 @@ func (r *TestResources) NewAgentProxyService() *corev1.Service {
 			Namespace: r.Namespace,
 			Labels: map[string]string{
 				"app":                         r.Name,
-				"component":                   "cryostat",
+				"component":                   "cryostat-agent-gateway",
 				"app.kubernetes.io/name":      "cryostat",
 				"app.kubernetes.io/instance":  r.Name,
-				"app.kubernetes.io/component": "cryostat",
+				"app.kubernetes.io/component": "cryostat-agent-gateway",
 				"app.kubernetes.io/part-of":   "cryostat",
 			},
 		},
@@ -901,11 +901,11 @@ func (r *TestResources) NewCustomizedAgentService() *corev1.Service {
 	}
 	svc.Labels = map[string]string{
 		"app":                         r.Name,
-		"component":                   "cryostat",
+		"component":                   "cryostat-agent-gateway",
 		"my":                          "label",
 		"app.kubernetes.io/name":      "cryostat",
 		"app.kubernetes.io/instance":  r.Name,
-		"app.kubernetes.io/component": "cryostat",
+		"app.kubernetes.io/component": "cryostat-agent-gateway",
 		"app.kubernetes.io/part-of":   "cryostat",
 	}
 	return svc