diff --git a/pkg/asset/machines/aws/machines.go b/pkg/asset/machines/aws/machines.go
index e0874d06520..1b1c919a08c 100644
--- a/pkg/asset/machines/aws/machines.go
+++ b/pkg/asset/machines/aws/machines.go
@@ -49,9 +49,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 				Namespace: "openshift-machine-api",
 				Name:      fmt.Sprintf("%s-%s-%d", clusterID, pool.Name, idx),
 				Labels: map[string]string{
-					"machine.openshift.io/cluster-api-cluster":      clusterID,
-					"machine.openshift.io/cluster-api-machine-role": role,
-					"machine.openshift.io/cluster-api-machine-type": role,
+					"machine.openshift.io/cluster-api-cluster": clusterID,
 				},
 			},
 			Spec: machineapi.MachineSpec{
diff --git a/pkg/asset/machines/aws/machinesets.go b/pkg/asset/machines/aws/machinesets.go
index f98b40ffa39..6ce34d982a9 100644
--- a/pkg/asset/machines/aws/machinesets.go
+++ b/pkg/asset/machines/aws/machinesets.go
@@ -51,9 +51,7 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 				Namespace: "openshift-machine-api",
 				Name:      name,
 				Labels: map[string]string{
-					"machine.openshift.io/cluster-api-cluster":      clusterID,
-					"machine.openshift.io/cluster-api-machine-role": role,
-					"machine.openshift.io/cluster-api-machine-type": role,
+					"machine.openshift.io/cluster-api-cluster": clusterID,
 				},
 			},
 			Spec: machineapi.MachineSetSpec{
@@ -67,10 +65,8 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 				Template: machineapi.MachineTemplateSpec{
 					ObjectMeta: metav1.ObjectMeta{
 						Labels: map[string]string{
-							"machine.openshift.io/cluster-api-machineset":   name,
-							"machine.openshift.io/cluster-api-cluster":      clusterID,
-							"machine.openshift.io/cluster-api-machine-role": role,
-							"machine.openshift.io/cluster-api-machine-type": role,
+							"machine.openshift.io/cluster-api-machineset": name,
+							"machine.openshift.io/cluster-api-cluster":    clusterID,
 						},
 					},
 					Spec: machineapi.MachineSpec{