diff --git a/templates/cluster-template-multitenancy-clusterclass.yaml b/templates/cluster-template-multitenancy-clusterclass.yaml
index a7599b0fb0..4f76099979 100644
--- a/templates/cluster-template-multitenancy-clusterclass.yaml
+++ b/templates/cluster-template-multitenancy-clusterclass.yaml
@@ -247,7 +247,7 @@ spec:
     - name: identityRef
       value:
         kind: AWSClusterRoleIdentity
-        name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
+        name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
     version: ${KUBERNETES_VERSION}
     workers:
       machineDeployments:
@@ -277,12 +277,12 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterRoleIdentity
 metadata:
-  name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
+  name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
 spec:
   allowedNamespaces: {}
   durationSeconds: 900
   roleARN: ${MULTI_TENANCY_JUMP_ROLE_ARN}
-  sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session
+  sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
   sourceIdentityRef:
     kind: AWSClusterControllerIdentity
     name: default
@@ -290,11 +290,11 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterRoleIdentity
 metadata:
-  name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
+  name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
 spec:
   allowedNamespaces: {}
   roleARN: ${MULTI_TENANCY_NESTED_ROLE_ARN}
-  sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session
+  sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
   sourceIdentityRef:
     kind: AWSClusterRoleIdentity
-    name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
+    name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
diff --git a/test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-nested-multitenancy-clusterclass.yaml b/test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-nested-multitenancy-clusterclass.yaml
index 5195d99d84..0c852c7354 100644
--- a/test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-nested-multitenancy-clusterclass.yaml
+++ b/test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-nested-multitenancy-clusterclass.yaml
@@ -31,7 +31,7 @@ spec:
     - name: identityRef
       value:
         kind: AWSClusterRoleIdentity
-        name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
+        name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
     version: ${KUBERNETES_VERSION}
     workers:
       machineDeployments:
@@ -87,12 +87,12 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterRoleIdentity
 metadata:
-  name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
+  name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
 spec:
   allowedNamespaces: {}
   durationSeconds: 900
   roleARN: ${MULTI_TENANCY_JUMP_ROLE_ARN}
-  sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session
+  sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
   sourceIdentityRef:
     kind: AWSClusterControllerIdentity
     name: default
@@ -100,14 +100,14 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterRoleIdentity
 metadata:
-  name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
+  name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
 spec:
   allowedNamespaces: {}
   roleARN: ${MULTI_TENANCY_NESTED_ROLE_ARN}
-  sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session
+  sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
   sourceIdentityRef:
     kind: AWSClusterRoleIdentity
-    name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
+    name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
 ---
 apiVersion: v1
 data:
diff --git a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/cluster-template.yaml b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/cluster-template.yaml
index 2636c4bcc4..0dd1a6e3fe 100644
--- a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/cluster-template.yaml
+++ b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/cluster-template.yaml
@@ -37,7 +37,7 @@ spec:
     - name: identityRef
       value:
         kind: AWSClusterRoleIdentity
-        name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
+        name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
 ---
 apiVersion: v1
 data: ${CNI_RESOURCES}
diff --git a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/role.yaml b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/role.yaml
index 08ce72cd0b..da233b0801 100644
--- a/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/role.yaml
+++ b/test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/role.yaml
@@ -2,11 +2,11 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterRoleIdentity
 metadata:
-  name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
+  name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
 spec:
   roleARN: "${MULTI_TENANCY_JUMP_ROLE_ARN}"
   durationSeconds: 900
-  sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session"
+  sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
   sourceIdentityRef:
     kind: AWSClusterControllerIdentity
     name: "default"
@@ -15,11 +15,11 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterRoleIdentity
 metadata:
-  name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
+  name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
 spec:
   roleARN: "${MULTI_TENANCY_NESTED_ROLE_ARN}"
-  sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session"
+  sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
   sourceIdentityRef:
     kind: AWSClusterRoleIdentity
-    name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
+    name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
   allowedNamespaces: {}
diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-nested-multitenancy.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-nested-multitenancy.yaml
index cab93da437..0250457be8 100644
--- a/test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-nested-multitenancy.yaml
+++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-nested-multitenancy.yaml
@@ -29,7 +29,7 @@ spec:
     enabled: true
   identityRef:
     kind: AWSClusterRoleIdentity
-    name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
+    name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
   network:
     vpc:
       availabilityZoneUsageLimit: 1
@@ -1165,12 +1165,12 @@ metadata:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterRoleIdentity
 metadata:
-  name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
+  name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
 spec:
   allowedNamespaces: {}
   durationSeconds: 900
   roleARN: ${MULTI_TENANCY_JUMP_ROLE_ARN}
-  sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session
+  sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
   sourceIdentityRef:
     kind: AWSClusterControllerIdentity
     name: default
@@ -1178,11 +1178,11 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterRoleIdentity
 metadata:
-  name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
+  name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
 spec:
   allowedNamespaces: {}
   roleARN: ${MULTI_TENANCY_NESTED_ROLE_ARN}
-  sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session
+  sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
   sourceIdentityRef:
     kind: AWSClusterRoleIdentity
-    name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
+    name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-simple-multitenancy.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-simple-multitenancy.yaml
index 2668643ac5..6e7744ed08 100644
--- a/test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-simple-multitenancy.yaml
+++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-simple-multitenancy.yaml
@@ -1160,7 +1160,7 @@ spec:
   allowedNamespaces: {}
   durationSeconds: 900
   roleARN: ${MULTI_TENANCY_SIMPLE_ROLE_ARN}
-  sessionName: ${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}-session
+  sessionName: ${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}
   sourceIdentityRef:
     kind: AWSClusterControllerIdentity
     name: default
diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/patches/role-identity.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/patches/role-identity.yaml
index 3d65b79213..954f1981a0 100644
--- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/patches/role-identity.yaml
+++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/patches/role-identity.yaml
@@ -6,4 +6,4 @@ metadata:
 spec:
   identityRef:
     kind: AWSClusterRoleIdentity
-    name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
+    name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/role.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/role.yaml
index 08ce72cd0b..da233b0801 100644
--- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/role.yaml
+++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/role.yaml
@@ -2,11 +2,11 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterRoleIdentity
 metadata:
-  name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
+  name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
 spec:
   roleARN: "${MULTI_TENANCY_JUMP_ROLE_ARN}"
   durationSeconds: 900
-  sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session"
+  sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
   sourceIdentityRef:
     kind: AWSClusterControllerIdentity
     name: "default"
@@ -15,11 +15,11 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
 kind: AWSClusterRoleIdentity
 metadata:
-  name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
+  name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
 spec:
   roleARN: "${MULTI_TENANCY_NESTED_ROLE_ARN}"
-  sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session"
+  sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
   sourceIdentityRef:
     kind: AWSClusterRoleIdentity
-    name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
+    name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
   allowedNamespaces: {}
diff --git a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/simple-multitenancy/role.yaml b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/simple-multitenancy/role.yaml
index 59fa15561e..27f6bc9d3d 100644
--- a/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/simple-multitenancy/role.yaml
+++ b/test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/simple-multitenancy/role.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   roleARN: "${MULTI_TENANCY_SIMPLE_ROLE_ARN}"
   durationSeconds: 900
-  sessionName: "${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}-session"
+  sessionName: "${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}"
   sourceIdentityRef:
     kind: AWSClusterControllerIdentity
     name: "default"