diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-details.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-details.yaml
similarity index 100%
rename from kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-details.yaml
rename to kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-details.yaml
diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/name-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-name-patch.json
similarity index 100%
rename from kubernetes/capi-kustomize/overlays/usw2-cluster1/name-patch.json
rename to kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-name-patch.json
diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-name-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-name-patch.json
new file mode 100644
index 0000000..19c2579
--- /dev/null
+++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-name-patch.json
@@ -0,0 +1,4 @@
+[
+  { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster-1" },
+  { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "usw2-cluster-1" }
+]
diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml
index 94858cc..2ebae4e 100644
--- a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml
+++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml
@@ -9,17 +9,29 @@ patchesJson6902:
       version: v1alpha2
       kind: Cluster
       name: capi-quickstart
-    path: name-patch.json
+    path: cluster-name-patch.json
   - target:
       group: infrastructure.cluster.x-k8s.io
       version: v1alpha2
       kind: AWSCluster
       name: capi-quickstart
-    path: name-patch.json
+    path: awscluster-name-patch.json
 patches:
   - target:
       group: infrastructure.cluster.x-k8s.io
       version: v1alpha2
       kind: AWSCluster
       name: capi-quickstart
-    path: cluster-details.yaml
+    path: awscluster-details.yaml
+  - target:
+      group: cluster.x-k8s.io
+      version: v1alpha2
+      kind: Machine
+      name: .*
+    path: machine-labels.yaml
+  - target:
+      group: cluster.x-k8s.io
+      version: v1alpha2
+      kind: MachineDeployment
+      name: .*
+    path: machinedeployment-labels.yaml
diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-labels.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-labels.yaml
new file mode 100644
index 0000000..31df16a
--- /dev/null
+++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-labels.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: cluster.x-k8s.io/v1alpha2
+kind: Machine
+metadata:
+  name: .*
+  labels:
+    cluster.x-k8s.io/cluster-name: "usw2-cluster1"
diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml
new file mode 100644
index 0000000..fd67f0f
--- /dev/null
+++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: MachineDeployment
+kind: MachineDeployment
+metadata:
+  name: .*
+  labels:
+    cluster.x-k8s.io/cluster-name: "usw2-cluster1"
+spec:
+  selector:
+    matchLabels:
+        cluster.x-k8s.io/cluster-name: "usw2-cluster1"
+  template:
+    metadata:
+      labels:
+        cluster.x-k8s.io/cluster-name: "usw2-cluster1"