diff --git a/features.md b/features.md
index 7a3982e3caf..5259884ec63 100644
--- a/features.md
+++ b/features.md
@@ -35,6 +35,12 @@
 | ClientsPreferCBOR| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ClusterAPIInstallIBMCloud| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ClusterAPIMachineManagement| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| ClusterAPIMachineManagementAWS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| ClusterAPIMachineManagementAzure| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| ClusterAPIMachineManagementBareMetal| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| ClusterAPIMachineManagementGCP| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| ClusterAPIMachineManagementOpenStack| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| ClusterAPIMachineManagementPowerVS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ClusterAPIMachineManagementVSphere| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ClusterMonitoringConfig| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ClusterUpdateAcceptRisks| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
@@ -60,6 +66,8 @@
 | IrreconcilableMachineConfig| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | KMSEncryption| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MachineAPIMigration| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| MachineAPIMigrationAWS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| MachineAPIMigrationOpenStack| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MaxUnavailableStatefulSet| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MinimumKubeletVersion| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MixedCPUsAllocation| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
index 40e08d0d8f8..3ba5f3113e9 100644
--- a/features/features.go
+++ b/features/features.go
@@ -537,13 +537,29 @@ var (
 						mustRegister()
 
 	FeatureGateMachineAPIMigration = newFeatureGate("MachineAPIMigration").
-					reportProblemsToJiraComponent("OCPCLOUD").
-					contactPerson("jspeed").
+					reportProblemsToJiraComponent("Cloud Compute / Cluster API Providers").
+					contactPerson("ddonati").
 					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
+					enhancementPR("https://github.com/openshift/enhancements/pull/1465").
 					enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
 					mustRegister()
 
+	FeatureGateMachineAPIMigrationAWS = newFeatureGate("MachineAPIMigrationAWS").
+						reportProblemsToJiraComponent("Cloud Compute / Cluster API Providers").
+						contactPerson("ddonati").
+						productScope(ocpSpecific).
+						enhancementPR("https://github.com/openshift/enhancements/pull/1465").
+						enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+						mustRegister()
+
+	FeatureGateMachineAPIMigrationOpenStack = newFeatureGate("MachineAPIMigrationOpenStack").
+						reportProblemsToJiraComponent("Cloud Compute / OpenStack Provider").
+						contactPerson("ddonati").
+						productScope(ocpSpecific).
+						enhancementPR("https://github.com/openshift/enhancements/pull/1465").
+						enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+						mustRegister()
+
 	FeatureGateClusterAPIMachineManagement = newFeatureGate("ClusterAPIMachineManagement").
 						reportProblemsToJiraComponent("Cloud Compute / Cluster API Providers").
 						contactPerson("ddonati").
@@ -552,6 +568,54 @@ var (
 						enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
 						mustRegister()
 
+	FeatureGateClusterAPIMachineManagementAWS = newFeatureGate("ClusterAPIMachineManagementAWS").
+							reportProblemsToJiraComponent("Cloud Compute / Cluster API Providers").
+							contactPerson("ddonati").
+							productScope(ocpSpecific).
+							enhancementPR("https://github.com/openshift/enhancements/pull/1465").
+							enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+							mustRegister()
+
+	FeatureGateClusterAPIMachineManagementAzure = newFeatureGate("ClusterAPIMachineManagementAzure").
+							reportProblemsToJiraComponent("Cloud Compute / Cluster API Providers").
+							contactPerson("ddonati").
+							productScope(ocpSpecific).
+							enhancementPR("https://github.com/openshift/enhancements/pull/1465").
+							enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+							mustRegister()
+
+	FeatureGateClusterAPIMachineManagementBareMetal = newFeatureGate("ClusterAPIMachineManagementBareMetal").
+							reportProblemsToJiraComponent("Cloud Compute / BareMetal Provider").
+							contactPerson("ddonati").
+							productScope(ocpSpecific).
+							enhancementPR("https://github.com/openshift/enhancements/pull/1465").
+							enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+							mustRegister()
+
+	FeatureGateClusterAPIMachineManagementGCP = newFeatureGate("ClusterAPIMachineManagementGCP").
+							reportProblemsToJiraComponent("Cloud Compute / Cluster API Providers").
+							contactPerson("ddonati").
+							productScope(ocpSpecific).
+							enhancementPR("https://github.com/openshift/enhancements/pull/1465").
+							enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+							mustRegister()
+
+	FeatureGateClusterAPIMachineManagementPowerVS = newFeatureGate("ClusterAPIMachineManagementPowerVS").
+							reportProblemsToJiraComponent("Cloud Compute / IBM Provider").
+							contactPerson("ddonati").
+							productScope(ocpSpecific).
+							enhancementPR("https://github.com/openshift/enhancements/pull/1465").
+							enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+							mustRegister()
+
+	FeatureGateClusterAPIMachineManagementOpenStack = newFeatureGate("ClusterAPIMachineManagementOpenStack").
+							reportProblemsToJiraComponent("Cloud Compute / OpenStack Provider").
+							contactPerson("ddonati").
+							productScope(ocpSpecific).
+							enhancementPR("https://github.com/openshift/enhancements/pull/1465").
+							enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+							mustRegister()
+
 	FeatureGateClusterAPIMachineManagementVSphere = newFeatureGate("ClusterAPIMachineManagementVSphere").
 							reportProblemsToJiraComponent("SPLAT").
 							contactPerson("jcpowermac").
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
index 874b6afbc15..db59d186a29 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -80,6 +80,24 @@
                     {
                         "name": "ClusterAPIMachineManagement"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagementAWS"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementAzure"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementBareMetal"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementGCP"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementOpenStack"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementPowerVS"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
@@ -164,6 +182,12 @@
                     {
                         "name": "MachineAPIMigration"
                     },
+                    {
+                        "name": "MachineAPIMigrationAWS"
+                    },
+                    {
+                        "name": "MachineAPIMigrationOpenStack"
+                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
index 1c1eab911c6..bcb089a53bf 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -123,6 +123,24 @@
                     {
                         "name": "ClusterAPIMachineManagement"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagementAWS"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementAzure"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementBareMetal"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementGCP"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementOpenStack"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementPowerVS"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
@@ -243,6 +261,12 @@
                     {
                         "name": "MachineAPIMigration"
                     },
+                    {
+                        "name": "MachineAPIMigrationAWS"
+                    },
+                    {
+                        "name": "MachineAPIMigrationOpenStack"
+                    },
                     {
                         "name": "MachineConfigNodes"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
index bc3a8fbf796..332c549cafa 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -82,6 +82,24 @@
                     {
                         "name": "ClusterAPIMachineManagement"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagementAWS"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementAzure"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementBareMetal"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementGCP"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementOpenStack"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementPowerVS"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
@@ -166,6 +184,12 @@
                     {
                         "name": "MachineAPIMigration"
                     },
+                    {
+                        "name": "MachineAPIMigrationAWS"
+                    },
+                    {
+                        "name": "MachineAPIMigrationOpenStack"
+                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
index 14cb32779b5..dcf160c5417 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -138,6 +138,24 @@
                     {
                         "name": "ClusterAPIMachineManagement"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagementAWS"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementAzure"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementBareMetal"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementGCP"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementOpenStack"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementPowerVS"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
@@ -249,6 +267,12 @@
                     {
                         "name": "MachineAPIMigration"
                     },
+                    {
+                        "name": "MachineAPIMigrationAWS"
+                    },
+                    {
+                        "name": "MachineAPIMigrationOpenStack"
+                    },
                     {
                         "name": "MachineConfigNodes"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
index 0d1818a256b..72e73eb4233 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -80,6 +80,24 @@
                     {
                         "name": "ClusterAPIMachineManagement"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagementAWS"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementAzure"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementBareMetal"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementGCP"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementOpenStack"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementPowerVS"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
@@ -167,6 +185,12 @@
                     {
                         "name": "MachineAPIMigration"
                     },
+                    {
+                        "name": "MachineAPIMigrationAWS"
+                    },
+                    {
+                        "name": "MachineAPIMigrationOpenStack"
+                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 3a0d70d983a..f29f4947246 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -105,6 +105,24 @@
                     {
                         "name": "ClusterAPIMachineManagement"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagementAWS"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementAzure"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementBareMetal"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementGCP"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementOpenStack"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementPowerVS"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
@@ -222,6 +240,12 @@
                     {
                         "name": "MachineAPIMigration"
                     },
+                    {
+                        "name": "MachineAPIMigrationAWS"
+                    },
+                    {
+                        "name": "MachineAPIMigrationOpenStack"
+                    },
                     {
                         "name": "MachineConfigNodes"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
index 4917cb8e590..7f29f0d1a1a 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -82,6 +82,24 @@
                     {
                         "name": "ClusterAPIMachineManagement"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagementAWS"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementAzure"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementBareMetal"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementGCP"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementOpenStack"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementPowerVS"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
@@ -169,6 +187,12 @@
                     {
                         "name": "MachineAPIMigration"
                     },
+                    {
+                        "name": "MachineAPIMigrationAWS"
+                    },
+                    {
+                        "name": "MachineAPIMigrationOpenStack"
+                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
index a060dc78742..be6d15233f7 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -120,6 +120,24 @@
                     {
                         "name": "ClusterAPIMachineManagement"
                     },
+                    {
+                        "name": "ClusterAPIMachineManagementAWS"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementAzure"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementBareMetal"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementGCP"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementOpenStack"
+                    },
+                    {
+                        "name": "ClusterAPIMachineManagementPowerVS"
+                    },
                     {
                         "name": "ClusterAPIMachineManagementVSphere"
                     },
@@ -228,6 +246,12 @@
                     {
                         "name": "MachineAPIMigration"
                     },
+                    {
+                        "name": "MachineAPIMigrationAWS"
+                    },
+                    {
+                        "name": "MachineAPIMigrationOpenStack"
+                    },
                     {
                         "name": "MachineConfigNodes"
                     },