diff --git a/internal/agentdeployer/agent.go b/internal/agentdeployer/agent.go
index 0927333dcf..be74e1f191 100644
--- a/internal/agentdeployer/agent.go
+++ b/internal/agentdeployer/agent.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	dockerTestAgentNamePrefix    = "elastic-agent"
+	dockerTestAgentServiceName   = "elastic-agent"
 	dockerTestAgentDockerCompose = "docker-agent-base.yml"
 	defaultAgentPolicyName       = "Elastic-Agent (elastic-package)"
 )
@@ -163,7 +163,7 @@ func (d *DockerComposeAgentDeployer) SetUp(ctx context.Context, agentInfo AgentI
 	}
 
 	// Service name defined in the docker-compose file
-	agentInfo.Name = dockerTestAgentNamePrefix
+	agentInfo.Name = dockerTestAgentServiceName
 	agentName := agentInfo.Name
 
 	opts := compose.CommandOptions{
@@ -223,7 +223,7 @@ func (d *DockerComposeAgentDeployer) SetUp(ctx context.Context, agentInfo AgentI
 }
 
 func (d *DockerComposeAgentDeployer) agentHostname() string {
-	return fmt.Sprintf("%s-%s-%s", dockerTestAgentNamePrefix, d.agentName(), d.agentRunID)
+	return fmt.Sprintf("%s-%s", dockerTestAgentServiceName, d.agentRunID)
 }
 
 func (d *DockerComposeAgentDeployer) agentName() string {