diff --git a/pkg/asset/machines/aws/machines.go b/pkg/asset/machines/aws/machines.go
index 4c1029a2014..ef3603bd2c8 100644
--- a/pkg/asset/machines/aws/machines.go
+++ b/pkg/asset/machines/aws/machines.go
@@ -47,7 +47,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 				Kind:       "Machine",
 			},
 			ObjectMeta: metav1.ObjectMeta{
-				Namespace: "openshift-cluster-api",
+				Namespace: "openshift-machine-api",
 				Name:      fmt.Sprintf("%s-%s-%d", clustername, pool.Name, idx),
 				Labels: map[string]string{
 					"sigs.k8s.io/cluster-api-cluster":      clustername,
diff --git a/pkg/asset/machines/aws/machinesets.go b/pkg/asset/machines/aws/machinesets.go
index 60c057c4c94..306825ba64e 100644
--- a/pkg/asset/machines/aws/machinesets.go
+++ b/pkg/asset/machines/aws/machinesets.go
@@ -49,7 +49,7 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 				Kind:       "MachineSet",
 			},
 			ObjectMeta: metav1.ObjectMeta{
-				Namespace: "openshift-cluster-api",
+				Namespace: "openshift-machine-api",
 				Name:      name,
 				Labels: map[string]string{
 					"sigs.k8s.io/cluster-api-cluster":      clustername,
diff --git a/pkg/asset/machines/libvirt/machines.go b/pkg/asset/machines/libvirt/machines.go
index 909e08a51ae..5649ef1c981 100644
--- a/pkg/asset/machines/libvirt/machines.go
+++ b/pkg/asset/machines/libvirt/machines.go
@@ -37,7 +37,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 				Kind:       "Machine",
 			},
 			ObjectMeta: metav1.ObjectMeta{
-				Namespace: "openshift-cluster-api",
+				Namespace: "openshift-machine-api",
 				Name:      fmt.Sprintf("%s-%s-%d", clustername, pool.Name, idx),
 				Labels: map[string]string{
 					"sigs.k8s.io/cluster-api-cluster":      clustername,
diff --git a/pkg/asset/machines/libvirt/machinesets.go b/pkg/asset/machines/libvirt/machinesets.go
index cbbfd98c19d..b26a370920a 100644
--- a/pkg/asset/machines/libvirt/machinesets.go
+++ b/pkg/asset/machines/libvirt/machinesets.go
@@ -40,7 +40,7 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 			Kind:       "MachineSet",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace: "openshift-cluster-api",
+			Namespace: "openshift-machine-api",
 			Name:      name,
 			Labels: map[string]string{
 				"sigs.k8s.io/cluster-api-cluster":      clustername,
diff --git a/pkg/asset/machines/userdata.go b/pkg/asset/machines/userdata.go
index c1687eda340..6bc350a98d0 100644
--- a/pkg/asset/machines/userdata.go
+++ b/pkg/asset/machines/userdata.go
@@ -20,7 +20,7 @@ items:
   kind: Secret
   metadata:
     name: {{$name}}
-    namespace: openshift-cluster-api
+    namespace: openshift-machine-api
   type: Opaque
   data:
     userData: {{$content}}