diff --git a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/01-assert.yaml b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/01-assert.yaml
index 0a28a34d5..766ffedf1 100644
--- a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/01-assert.yaml
+++ b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/01-assert.yaml
@@ -16,18 +16,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_test
+  name: example-argocd_test-thirtysix
   namespace: test-thirtysix
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_test
+  name: example-argocd_test-thirtysix
   namespace: test-thirtysix
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_test
+  name: example-argocd_test-thirtysix
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
diff --git a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/02-assert.yaml b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/02-assert.yaml
index 8c9bbe010..330db36ea 100644
--- a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/02-assert.yaml
+++ b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/02-assert.yaml
@@ -16,18 +16,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_test
+  name: example-argocd_test-thirtysix
   namespace: test-thirtysix
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_test
+  name: example-argocd_test-thirtysix
   namespace: test-thirtysix
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_test
+  name: example-argocd_test-thirtysix
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
@@ -43,18 +43,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_test-1
+  name: example-argocd_test-thirtysix-1
   namespace: test-thirtysix-1
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_test-1
+  name: example-argocd_test-thirtysix-1
   namespace: test-thirtysix-1
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_test-1
+  name: example-argocd_test-thirtysix-1
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
diff --git a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/03-assert.yaml b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/03-assert.yaml
index 38a5cafa4..7afba153e 100644
--- a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/03-assert.yaml
+++ b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/03-assert.yaml
@@ -16,18 +16,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_test-2
+  name: example-argocd_test-thirtysix-2
   namespace: test-thirtysix-2
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_test-2
+  name: example-argocd_test-thirtysix-2
   namespace: test-thirtysix-2
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_test-2
+  name: example-argocd_test-thirtysix-2
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
diff --git a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/04-assert.yaml b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/04-assert.yaml
index d26fa1e9c..a0e024fa4 100644
--- a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/04-assert.yaml
+++ b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/04-assert.yaml
@@ -37,18 +37,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_test
+  name: example-argocd_test-thirtysix
   namespace: test-thirtysix
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_test
+  name: example-argocd_test-thirtysix
   namespace: test-thirtysix
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_test
+  name: example-argocd_test-thirtysix
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
@@ -57,7 +57,6 @@ subjects:
   name: example-argocd-argocd-application-controller
   namespace: default
 ---
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -65,18 +64,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_test-1
+  name: example-argocd_test-thirtysix-1
   namespace: test-thirtysix-1
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_test-1
+  name: example-argocd_test-thirtysix-1
   namespace: test-thirtysix-1
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_test-1
+  name: example-argocd_test-thirtysix-1
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
@@ -92,18 +91,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_test-2
+  name: example-argocd_test-thirtysix-2
   namespace: test-thirtysix-2
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_test-2
+  name: example-argocd_test-thirtysix-2
   namespace: test-thirtysix-2
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_test-2
+  name: example-argocd_test-thirtysix-2
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
@@ -119,18 +118,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_dev
+  name: example-argocd_dev-thirtysix
   namespace: dev-thirtysix
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_dev
+  name: example-argocd_dev-thirtysix
   namespace: dev-thirtysix
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_dev
+  name: example-argocd_dev-thirtysix
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
diff --git a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/05-assert.yaml b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/05-assert.yaml
index 3e571480d..28b6f519f 100644
--- a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/05-assert.yaml
+++ b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/05-assert.yaml
@@ -23,18 +23,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_test-ns-1
+  name: example-argocd_test-ns-thirtysix-1
   namespace: test-ns-thirtysix-1
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_test-ns-1
+  name: example-argocd_test-ns-thirtysix-1
   namespace: test-ns-thirtysix-1
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_test-ns-1
+  name: example-argocd_test-ns-thirtysix-1
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
@@ -50,18 +50,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_dev-ns-1
+  name: example-argocd_dev-ns-thirtysix-1
   namespace: dev-ns-thirtysix-1
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_dev-ns-1
+  name: example-argocd_dev-ns-thirtysix-1
   namespace: dev-ns-thirtysix-1
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_dev-ns-1
+  name: example-argocd_dev-ns-thirtysix-1
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
diff --git a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/05-errors.yaml b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/05-errors.yaml
index 6b0422a09..c49753d00 100644
--- a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/05-errors.yaml
+++ b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/05-errors.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_other-ns
+  name: example-argocd_other-ns-thirtysix
   namespace: other-ns-thirtysix
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -16,7 +16,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_other-ns
+  name: example-argocd_other-ns-thirtysix
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server
diff --git a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/06-errors.yaml b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/06-errors.yaml
index 47f85eeba..d48d51849 100644
--- a/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/06-errors.yaml
+++ b/tests/k8s/1-036_validate_role_rolebinding_for_source_namespace/06-errors.yaml
@@ -5,18 +5,18 @@ metadata:
     app.kubernetes.io/managed-by: example-argocd
     app.kubernetes.io/name: example-argocd
     app.kubernetes.io/part-of: argocd
-  name: example-argocd_dev-ns-1
+  name: example-argocd_dev-ns-thirtysix-1
   namespace: dev-ns-thirtysix-1
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: example-argocd_dev-ns-1
+  name: example-argocd_dev-ns-thirtysix-1
   namespace: dev-ns-thirtysix-1
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: example-argocd_dev-ns-1
+  name: example-argocd_dev-ns-thirtysix-1
 subjects:
 - kind: ServiceAccount
   name: example-argocd-argocd-server