diff --git a/test/e2e/tests/k8s_suite/kind_aws_test.go b/test/e2e/tests/k8s_suite/kind_aws_test.go
index 75264adbe..745802bb7 100644
--- a/test/e2e/tests/k8s_suite/kind_aws_test.go
+++ b/test/e2e/tests/k8s_suite/kind_aws_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/DataDog/datadog-operator/test/e2e/common"
 	"github.com/DataDog/datadog-operator/test/e2e/provisioners"
 	"github.com/DataDog/test-infra-definitions/components/datadog/operatorparams"
+	"strings"
 	"testing"
 )
 
@@ -32,7 +33,7 @@ func TestAWSKindSuite(t *testing.T) {
 	}
 
 	e2eOpts := []e2e.SuiteOption{
-		e2e.WithStackName(fmt.Sprintf("operator-awskind-%s", common.K8sVersion)),
+		e2e.WithStackName(fmt.Sprintf("operator-awskind-%s", strings.ReplaceAll(common.K8sVersion, ".", "-"))),
 		e2e.WithProvisioner(provisioners.KubernetesProvisioner(provisionerOptions...)),
 	}
 
diff --git a/test/e2e/tests/k8s_suite/kind_local_test.go b/test/e2e/tests/k8s_suite/kind_local_test.go
index a875677dd..b3c5e4494 100644
--- a/test/e2e/tests/k8s_suite/kind_local_test.go
+++ b/test/e2e/tests/k8s_suite/kind_local_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/DataDog/datadog-operator/test/e2e/common"
 	"github.com/DataDog/datadog-operator/test/e2e/provisioners"
 	"github.com/DataDog/test-infra-definitions/components/datadog/operatorparams"
+	"strings"
 	"testing"
 )
 
@@ -39,7 +40,7 @@ func TestLocalKindSuite(t *testing.T) {
 	}
 
 	e2eOpts := []e2e.SuiteOption{
-		e2e.WithStackName(fmt.Sprintf("operator-localkind-%s", common.K8sVersion)),
+		e2e.WithStackName(fmt.Sprintf("operator-localkind-%s", strings.ReplaceAll(common.K8sVersion, ".", "-"))),
 		e2e.WithProvisioner(provisioners.KubernetesProvisioner(provisionerOptions...)),
 	}