diff --git a/api/v1beta1/types_class.go b/api/v1beta1/types_class.go
index 562e5bc58df..308c31492a0 100644
--- a/api/v1beta1/types_class.go
+++ b/api/v1beta1/types_class.go
@@ -473,7 +473,7 @@ type SubnetClassSpec struct {
 	Name string `json:"name"`
 
 	// Role defines the subnet role (eg. Node, ControlPlane)
-	// +kubebuilder:validation:Enum=node;control-plane;bastion;all
+	// +kubebuilder:validation:Enum=node;control-plane;bastion;cluster
 	Role SubnetRole `json:"role"`
 
 	// CIDRBlocks defines the subnet's address space, specified as one or more address prefixes in CIDR notation.
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml
index 0b6f9404992..c8ec7ba26f1 100644
--- a/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml
+++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml
@@ -307,7 +307,7 @@ spec:
                             - node
                             - control-plane
                             - bastion
-                            - all
+                            - cluster
                             type: string
                           routeTable:
                             description: RouteTable defines the route table that should
@@ -1057,7 +1057,7 @@ spec:
                           - node
                           - control-plane
                           - bastion
-                          - all
+                          - cluster
                           type: string
                         routeTable:
                           description: RouteTable defines the route table that should
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclustertemplates.yaml
index 5b7c5571777..1a017508031 100644
--- a/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclustertemplates.yaml
+++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclustertemplates.yaml
@@ -204,7 +204,7 @@ spec:
                                     - node
                                     - control-plane
                                     - bastion
-                                    - all
+                                    - cluster
                                     type: string
                                   securityGroup:
                                     description: SecurityGroup defines the NSG (network
@@ -698,7 +698,7 @@ spec:
                                   - node
                                   - control-plane
                                   - bastion
-                                  - all
+                                  - cluster
                                   type: string
                                 securityGroup:
                                   description: SecurityGroup defines the NSG (network