diff --git a/integration_common_test.go b/integration_common_test.go
index 9cce12fa..a72af91f 100644
--- a/integration_common_test.go
+++ b/integration_common_test.go
@@ -19,7 +19,7 @@ import (
 )
 
 const (
-	headscaleHostname      = "headscale-derp"
+	headscaleHostname      = "headscale"
 	DOCKER_EXECUTE_TIMEOUT = 10 * time.Second
 )
 
diff --git a/integration_embedded_derp_test.go b/integration_embedded_derp_test.go
index a31006e1..4a8a337f 100644
--- a/integration_embedded_derp_test.go
+++ b/integration_embedded_derp_test.go
@@ -27,6 +27,7 @@ import (
 )
 
 const (
+	headscaleDerpHostname = "headscale-derp"
 	namespaceName   = "derpnamespace"
 	totalContainers = 3
 )
@@ -112,7 +113,7 @@ func (s *IntegrationDERPTestSuite) SetupSuite() {
 	}
 
 	headscaleOptions := &dockertest.RunOptions{
-		Name: headscaleHostname,
+		Name: headscaleDerpHostname,
 		Mounts: []string{
 			fmt.Sprintf(
 				"%s/integration_test/etc_embedded_derp:/etc/headscale",
@@ -127,7 +128,7 @@ func (s *IntegrationDERPTestSuite) SetupSuite() {
 		},
 	}
 
-	err = s.pool.RemoveContainerByName(headscaleHostname)
+	err = s.pool.RemoveContainerByName(headscaleDerpHostname)
 	if err != nil {
 		s.FailNow(
 			fmt.Sprintf(
diff --git a/integration_general_test.go b/integration_general_test.go
index 5abdccbb..2f61cfe9 100644
--- a/integration_general_test.go
+++ b/integration_general_test.go
@@ -236,7 +236,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	}
 
 	headscaleOptions := &dockertest.RunOptions{
-		Name: "headscale",
+		Name: headscaleHostname,
 		Mounts: []string{
 			fmt.Sprintf("%s/integration_test/etc:/etc/headscale", currentPath),
 		},