diff --git a/manifests/site/reference-multi-tenant/sub-clusters/lma/workers/kustomization.yaml b/manifests/site/reference-multi-tenant/sub-clusters/lma/workers/kustomization.yaml
index 4e7e9fe76..75cfce638 100644
--- a/manifests/site/reference-multi-tenant/sub-clusters/lma/workers/kustomization.yaml
+++ b/manifests/site/reference-multi-tenant/sub-clusters/lma/workers/kustomization.yaml
@@ -1,7 +1,6 @@
 resources:
   - ../../../../../type/multi-tenant/sub-clusters/lma/workers
   - ../catalogues
-  - metal3machinetemplate.yaml
 
 transformers:
   - ../../../../../type/multi-tenant/sub-clusters/lma/workers/replacements
diff --git a/manifests/type/multi-tenant/sub-clusters/lma/controlplane/kustomization.yaml b/manifests/type/multi-tenant/sub-clusters/lma/controlplane/kustomization.yaml
index 7de7af44e..485a28450 100644
--- a/manifests/type/multi-tenant/sub-clusters/lma/controlplane/kustomization.yaml
+++ b/manifests/type/multi-tenant/sub-clusters/lma/controlplane/kustomization.yaml
@@ -1,2 +1,5 @@
 resources:
   - ../../../../sub-cluster/controlplane
+
+patchesStrategicMerge:
+  - patches/metal3machinetemplate.yaml
diff --git a/manifests/type/multi-tenant/sub-clusters/lma/controlplane/patches/metal3machinetemplate.yaml b/manifests/type/multi-tenant/sub-clusters/lma/controlplane/patches/metal3machinetemplate.yaml
new file mode 100644
index 000000000..a945d60c4
--- /dev/null
+++ b/manifests/type/multi-tenant/sub-clusters/lma/controlplane/patches/metal3machinetemplate.yaml
@@ -0,0 +1,11 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
+kind: Metal3MachineTemplate
+metadata:
+  name: cluster-controlplane
+spec:
+  template:
+    spec:
+      hostSelector:
+        matchLabels:
+          sip.airshipit.org/cluster-namespace: lma-infra
+          sip.airshipit.org/cluster-name: lma
diff --git a/manifests/type/multi-tenant/sub-clusters/lma/workers/kustomization.yaml b/manifests/type/multi-tenant/sub-clusters/lma/workers/kustomization.yaml
index 900c0405c..c8f323d4a 100644
--- a/manifests/type/multi-tenant/sub-clusters/lma/workers/kustomization.yaml
+++ b/manifests/type/multi-tenant/sub-clusters/lma/workers/kustomization.yaml
@@ -6,3 +6,4 @@ commonLabels:
 
 patchesStrategicMerge:
   - patches/machinedeployment.yaml
+  - patches/metal3machinetemplate.yaml
diff --git a/manifests/type/multi-tenant/sub-clusters/lma/workers/patches/metal3machinetemplate.yaml b/manifests/type/multi-tenant/sub-clusters/lma/workers/patches/metal3machinetemplate.yaml
new file mode 100644
index 000000000..ea3ec07ef
--- /dev/null
+++ b/manifests/type/multi-tenant/sub-clusters/lma/workers/patches/metal3machinetemplate.yaml
@@ -0,0 +1,11 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
+kind: Metal3MachineTemplate
+metadata:
+  name: worker-1
+spec:
+  template:
+    spec:
+      hostSelector:
+        matchLabels:
+          sip.airshipit.org/cluster-namespace: lma-infra
+          sip.airshipit.org/cluster-name: lma
diff --git a/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/kustomization.yaml b/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/kustomization.yaml
index 7de7af44e..485a28450 100644
--- a/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/kustomization.yaml
+++ b/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/kustomization.yaml
@@ -1,2 +1,5 @@
 resources:
   - ../../../../sub-cluster/controlplane
+
+patchesStrategicMerge:
+  - patches/metal3machinetemplate.yaml
diff --git a/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/patches/metal3machinetemplate.yaml b/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/patches/metal3machinetemplate.yaml
new file mode 100644
index 000000000..ab02064cc
--- /dev/null
+++ b/manifests/type/multi-tenant/sub-clusters/wordpress/controlplane/patches/metal3machinetemplate.yaml
@@ -0,0 +1,11 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
+kind: Metal3MachineTemplate
+metadata:
+  name: cluster-controlplane
+spec:
+  template:
+    spec:
+      hostSelector:
+        matchLabels:
+          sip.airshipit.org/cluster-namespace: wordpress-infra
+          sip.airshipit.org/cluster-name: wordpress
diff --git a/manifests/type/multi-tenant/sub-clusters/wordpress/workers/kustomization.yaml b/manifests/type/multi-tenant/sub-clusters/wordpress/workers/kustomization.yaml
index 364cf41e8..e7edfd4c5 100644
--- a/manifests/type/multi-tenant/sub-clusters/wordpress/workers/kustomization.yaml
+++ b/manifests/type/multi-tenant/sub-clusters/wordpress/workers/kustomization.yaml
@@ -1,2 +1,10 @@
 resources:
   - ../../../../sub-cluster/workers
+
+patchesJson6902:
+- target:
+    group: infrastructure.cluster.x-k8s.io
+    version: v1alpha3
+    kind: Metal3MachineTemplate
+    name: worker-1
+  path: patches/metal3machinetemplate.yaml
diff --git a/manifests/type/multi-tenant/sub-clusters/wordpress/workers/patches/metal3machinetemplate.yaml b/manifests/type/multi-tenant/sub-clusters/wordpress/workers/patches/metal3machinetemplate.yaml
new file mode 100644
index 000000000..15f250163
--- /dev/null
+++ b/manifests/type/multi-tenant/sub-clusters/wordpress/workers/patches/metal3machinetemplate.yaml
@@ -0,0 +1,11 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
+kind: Metal3MachineTemplate
+metadata:
+  name: worker-1
+spec:
+  template:
+    spec:
+      hostSelector:
+        matchLabels:
+          sip.airshipit.org/cluster-namespace: wordpress-infra
+          sip.airshipit.org/cluster-name: wordpress
diff --git a/manifests/type/sub-cluster/controlplane/kustomization.yaml b/manifests/type/sub-cluster/controlplane/kustomization.yaml
index f01834d0b..deb731fcd 100644
--- a/manifests/type/sub-cluster/controlplane/kustomization.yaml
+++ b/manifests/type/sub-cluster/controlplane/kustomization.yaml
@@ -2,3 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../function/k8scontrol-ha
+
+patchesJson6902:
+- target:
+    group: infrastructure.cluster.x-k8s.io
+    version: v1alpha4
+    kind: Metal3MachineTemplate
+    name: cluster-controlplane
+  path: patches/metal3machinetemplate.yaml
diff --git a/manifests/type/sub-cluster/controlplane/patches/metal3machinetemplate.yaml b/manifests/type/sub-cluster/controlplane/patches/metal3machinetemplate.yaml
new file mode 100644
index 000000000..16bb842ad
--- /dev/null
+++ b/manifests/type/sub-cluster/controlplane/patches/metal3machinetemplate.yaml
@@ -0,0 +1,4 @@
+- op: replace
+  path: /spec/template/spec/hostSelector/matchLabels
+  value:
+    sip.airshipit.org/node-type: ControlPlane
diff --git a/manifests/type/sub-cluster/workers/kustomization.yaml b/manifests/type/sub-cluster/workers/kustomization.yaml
index b1c1a89b1..43d9b8cdb 100644
--- a/manifests/type/sub-cluster/workers/kustomization.yaml
+++ b/manifests/type/sub-cluster/workers/kustomization.yaml
@@ -3,3 +3,4 @@ kind: Kustomization
 resources:
   - kubeadmconfigtemplate.yaml
   - machinedeployment.yaml
+  - metal3machinetemplate.yaml
diff --git a/manifests/site/reference-multi-tenant/sub-clusters/lma/workers/metal3machinetemplate.yaml b/manifests/type/sub-cluster/workers/metal3machinetemplate.yaml
similarity index 76%
rename from manifests/site/reference-multi-tenant/sub-clusters/lma/workers/metal3machinetemplate.yaml
rename to manifests/type/sub-cluster/workers/metal3machinetemplate.yaml
index f4405f62a..da909da1a 100644
--- a/manifests/site/reference-multi-tenant/sub-clusters/lma/workers/metal3machinetemplate.yaml
+++ b/manifests/type/sub-cluster/workers/metal3machinetemplate.yaml
@@ -8,3 +8,6 @@ spec:
       image:
         url: http://10.23.24.102:80/images/data-plane.qcow2
         checksum: http://10.23.24.102:80/images/data-plane.qcow2.md5sum
+      hostSelector:
+        matchLabels:
+          sip.airshipit.org/node-type: Worker