diff --git a/infrastructure/kubernetes.go b/infrastructure/kubernetes.go
index 4c6457f..e8bca8e 100644
--- a/infrastructure/kubernetes.go
+++ b/infrastructure/kubernetes.go
@@ -539,8 +539,8 @@ func (k *KubernetesService) GetOneNode(context context.Context, executionID stri
 // kubernetes ressources to have a unique name, under 63 characters
 // and yet identify which peer they are created for
 func getConcatenatedName(peerId string, namespace string) string {
-	s := strings.Split(peerId, "-")[:2]
-	p := s[0] + "-" + s[1]
+	s := strings.Split(namespace, "-")[:2]
+	n := s[0] + "-" + s[1]
 
-	return p + "-" + namespace
+	return peerId + "-" + n
 }