diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
index 9d88c82eee0f..910cf542844b 100644
--- a/_topic_maps/_topic_map.yml
+++ b/_topic_maps/_topic_map.yml
@@ -2310,10 +2310,51 @@ Distros: openshift-origin,openshift-enterprise
 Topics:
 - Name: Overview of machine management
   File: index
+- Name: Machine phases and lifecycle
+  File: machine-phases-lifecycle
 - Name: Managing compute machines with the Machine API
-  Dir: creating_machinesets
+  Dir: compute_machine_management
   Distros: openshift-origin,openshift-enterprise
   Topics:
+  # - Name: About compute machine sets
+  #   File: mapi-compute-about
+  # - Name: Getting started with compute machine sets
+  #   File: mapi-compute-getting-started
+  - Name: Managing compute machines with compute machine sets
+    Dir: mapi_compute_managing_machines
+    Topics:
+    - Name: Manually scaling a compute machine set
+      File: manually-scaling-machineset
+    - Name: Modifying a compute machine set
+      File: modifying-machineset
+  # - Name: Compute machine set configuration
+  #   File: mapi-compute-configuration
+  # - Name: Configuration options for compute machines
+  #   Dir: mapi_compute_provider_configurations
+  #   Topics:
+  #   - Name: Compute configuration options for Amazon Web Services
+  #     File: mapi-compute-config-options-aws
+  #   - Name: Compute configuration options for Microsoft Azure
+  #     File: mapi-compute-config-options-azure
+  #   - Name: Compute configuration options for Google Cloud Platform
+  #     File: mapi-compute-config-options-gcp
+  #   - Name: Compute configuration options for Nutanix
+  #     File: mapi-compute-config-options-nutanix
+  #   - Name: Compute configuration options for Red Hat OpenStack Platform
+  #     File: mapi-compute-config-options-openstack
+  #   - Name: Compute configuration options for VMware vSphere
+  #     File: mapi-compute-config-options-vsphere
+  - Name: Applying autoscaling to a cluster
+    File: applying-autoscaling
+  # - Name: Compute resiliency and recovery
+  #   File: mapi-compute-resiliency
+  # - Name: Troubleshooting the compute machine set
+  #   File: mapi-compute-troubleshooting
+  # - Name: Disabling compute machine sets
+  #   File: mapi-compute-disabling
+- Name: Creating compute machine sets
+  Dir: creating_machinesets
+  Topics:
   - Name: Creating a compute machine set on AWS
     File: creating-machineset-aws
   - Name: Creating a compute machine set on Azure
@@ -2334,35 +2375,8 @@ Topics:
     File: creating-machineset-vsphere
   - Name: Creating a compute machine set on bare metal
     File: creating-machineset-bare-metal
-- Name: Manually scaling a compute machine set
-  File: manually-scaling-machineset
-- Name: Modifying a compute machine set
-  File: modifying-machineset
-- Name: Machine phases and lifecycle
-  File: machine-phases-lifecycle
-- Name: Deleting a machine
-  File: deleting-machine
-- Name: Applying autoscaling to a cluster
-  File: applying-autoscaling
-- Name: Creating infrastructure machine sets
-  File: creating-infrastructure-machinesets
-- Name: Adding a RHEL compute machine
-  File: adding-rhel-compute
-  Distros: openshift-enterprise
-- Name: Adding more RHEL compute machines
-  File: more-rhel-compute
-  Distros: openshift-enterprise
-- Name: Managing user-provisioned infrastructure manually
-  Dir: user_infra
-  Topics:
-  - Name: Adding compute machines to clusters with user-provisioned infrastructure manually
-    File: adding-compute-user-infra-general
-  - Name: Adding compute machines to AWS using CloudFormation templates
-    File: adding-aws-compute-user-infra
-  - Name: Adding compute machines to vSphere manually
-    File: adding-vsphere-compute-user-infra
-  - Name: Adding compute machines to bare metal
-    File: adding-bare-metal-compute-user-infra
+  - Name: Creating infrastructure machine sets
+    File: creating-infrastructure-machinesets
 - Name: Managing control plane machines
   Dir: control_plane_machine_management
   Topics:
@@ -2395,6 +2409,28 @@ Topics:
     File: cpmso-troubleshooting
   - Name: Disabling the control plane machine set
     File: cpmso-disabling
+- Name: Managing compute machines manually
+  Dir: manual_machine_management
+  Topics:
+  - Name: Managing user-provisioned infrastructure manually
+    Dir: user_infra
+    Topics:
+    - Name: Adding compute machines to clusters with user-provisioned infrastructure manually
+      File: adding-compute-user-infra-general
+    - Name: Adding compute machines to AWS using CloudFormation templates
+      File: adding-aws-compute-user-infra
+    - Name: Adding compute machines to vSphere manually
+      File: adding-vsphere-compute-user-infra
+    - Name: Adding compute machines to bare metal
+      File: adding-bare-metal-compute-user-infra
+  - Name: Adding a RHEL compute machine
+    File: adding-rhel-compute
+    Distros: openshift-enterprise
+  - Name: Adding more RHEL compute machines
+    File: more-rhel-compute
+    Distros: openshift-enterprise
+  - Name: Deleting a machine
+    File: deleting-machine
 - Name: Managing machines with the Cluster API
   Dir: cluster_api_machine_management
   Topics:
diff --git a/backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc b/backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc
index 95c74001add0..bfe2496f4e87 100644
--- a/backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc
+++ b/backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc
@@ -52,4 +52,4 @@ include::modules/restore-replace-stopped-baremetal-etcd-member.adoc[leveloffset=
 [role="_additional-resources"]
 [id="additional-resources_replacing-unhealthy-etcd-member"]
 == Additional resources
-* xref:../../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion-etcd_deleting-machine[Quorum protection with machine lifecycle hooks]
\ No newline at end of file
+* xref:../../machine_management/manual_machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion-etcd_deleting-machine[Quorum protection with machine lifecycle hooks]
\ No newline at end of file
diff --git a/backup_and_restore/index.adoc b/backup_and_restore/index.adoc
index 4d7a66f56dbe..a4842d0e9baf 100644
--- a/backup_and_restore/index.adoc
+++ b/backup_and_restore/index.adoc
@@ -31,7 +31,7 @@ You can always recover from a disaster situation by xref:../backup_and_restore/c
 
 [role="_additional-resources"]
 .Additional resources
-* xref:../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion-etcd_deleting-machine[Quorum protection with machine lifecycle hooks]
+* xref:../machine_management/manual_machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion-etcd_deleting-machine[Quorum protection with machine lifecycle hooks]
 
 [id="application-backup-restore-operations-overview"]
 == Application backup and restore operations
diff --git a/cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc b/cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc
index f28355092f08..771570e7195e 100644
--- a/cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc
+++ b/cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc
@@ -25,7 +25,7 @@ include::modules/go-run-argo-cd-instance-on-infrastructure-nodes.adoc[leveloffse
 ifndef::openshift-dedicated,openshift-rosa[]
 * To learn more about taints and tolerations, see xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints].
 endif::openshift-dedicated,openshift-rosa[]
-* For more information on infrastructure machine sets, see xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets].
+* For more information on infrastructure machine sets, see xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets].
 
 include::modules/gitops-creating-an-application-by-using-the-argo-cd-dashboard.adoc[leveloffset=+1]
 
diff --git a/cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.adoc b/cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.adoc
index eec2e8af9792..99fe60e6b8b6 100644
--- a/cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.adoc
+++ b/cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.adoc
@@ -23,4 +23,4 @@ include::modules/go-add-infra-nodes.adoc[leveloffset=+1]
 ifndef::openshift-dedicated,openshift-rosa[]
 * To learn more about taints and tolerations, see xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints].
 endif::openshift-dedicated,openshift-rosa[]
-* For more information on infrastructure machine sets, see xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets].
+* For more information on infrastructure machine sets, see xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets].
diff --git a/getting_started/openshift-overview.adoc b/getting_started/openshift-overview.adoc
index b5030070c4d7..60de2e543dc8 100644
--- a/getting_started/openshift-overview.adoc
+++ b/getting_started/openshift-overview.adoc
@@ -83,7 +83,7 @@ xref:../operators/operator_sdk/helm/osdk-helm-support.adoc#osdk-helm-support[Hel
 
 === For administrators
 *  **xref:../architecture/architecture.adoc#architecture-overview-architecture[Understand {product-title} management]**: Learn about components
-of the {product-title} {product-version} control plane. See how {product-title} control plane and worker nodes are managed and updated through the xref:../machine_management/creating_machinesets/creating-machineset-aws.adoc#machine-api-overview_creating-machineset-aws[Machine API] and xref:../architecture/control-plane.adoc#operators-overview_control-plane[Operators].
+of the {product-title} {product-version} control plane. See how {product-title} control plane and compute nodes are managed and updated through the xref:../machine_management/index.adoc#machine-mgmt-intro-managing-compute_overview-of-machine-management[Machine API] and xref:../architecture/control-plane.adoc#operators-overview_control-plane[Operators].
 
 * **xref:../authentication/understanding-authentication.adoc#understanding-authentication[Manage users and groups]**: Add users and groups with different levels of permissions to use or modify clusters.
 
diff --git a/installing/installing_nutanix/nutanix-failure-domains.adoc b/installing/installing_nutanix/nutanix-failure-domains.adoc
index c3f533566b19..d8252958cf17 100644
--- a/installing/installing_nutanix/nutanix-failure-domains.adoc
+++ b/installing/installing_nutanix/nutanix-failure-domains.adoc
@@ -51,7 +51,7 @@ include::modules/post-installation-adding-nutanix-failure-domains-compute-machin
 
 [role="_additional-resources"]
 .Additional resources
-* xref:../../machine_management/modifying-machineset.adoc#modifying-machineset[Modifying a compute machine set]
+* xref:../../machine_management/compute_machine_management/mapi_compute_managing_machines/modifying-machineset.adoc#modifying-machineset[Modifying a compute machine set]
 
 include::modules/post-installation-adding-nutanix-failure-domains-compute-machines-replace.adoc[leveloffset=+3]
 
diff --git a/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc b/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc
index 3ece0db425bd..7115a76430a2 100644
--- a/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc
+++ b/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc
@@ -136,7 +136,7 @@ For instructions about configuring registry storage so that it references the co
 
 include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
 
-You can add extra compute machines after the cluster installation is completed by following xref:../../machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
+You can add extra compute machines after the cluster installation is completed by following xref:../../machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
 
 include::modules/persistent-storage-vsphere-backup.adoc[leveloffset=+1]
 
diff --git a/installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc b/installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc
index ce377047e549..a62685edf39e 100644
--- a/installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc
+++ b/installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc
@@ -121,7 +121,7 @@ For instructions about configuring registry storage so that it references the co
 
 include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
 
-You can add extra compute machines after the cluster installation is completed by following xref:../../machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
+You can add extra compute machines after the cluster installation is completed by following xref:../../machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
 
 include::modules/persistent-storage-vsphere-backup.adoc[leveloffset=+1]
 
diff --git a/installing/installing_vmc/installing-vmc-user-infra.adoc b/installing/installing_vmc/installing-vmc-user-infra.adoc
index 10dfa6c07714..c89e2beffd0b 100644
--- a/installing/installing_vmc/installing-vmc-user-infra.adoc
+++ b/installing/installing_vmc/installing-vmc-user-infra.adoc
@@ -128,7 +128,7 @@ For instructions about configuring registry storage so that it references the co
 
 include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
 
-You can add extra compute machines after the cluster installation is completed by following xref:../../machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
+You can add extra compute machines after the cluster installation is completed by following xref:../../machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
 
 include::modules/persistent-storage-vsphere-backup.adoc[leveloffset=+1]
 
diff --git a/installing/installing_vsphere/post-install-vsphere-zones-regions-configuration.adoc b/installing/installing_vsphere/post-install-vsphere-zones-regions-configuration.adoc
index 5ac6f676262f..85c11445e81d 100644
--- a/installing/installing_vsphere/post-install-vsphere-zones-regions-configuration.adoc
+++ b/installing/installing_vsphere/post-install-vsphere-zones-regions-configuration.adoc
@@ -42,7 +42,7 @@ include::modules/vsphere-enabling-multiple-layer2-networks.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 * xref:../../installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc#installing-vsphere-network-customizations[Installing a cluster on vSphere with network customizations]
-* xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets-production[Creating infrastructure machine sets for production environments]
+* xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets-production[Creating infrastructure machine sets for production environments]
 * xref:../../machine_management/creating_machinesets/creating-machineset-vsphere.adoc#machineset-creating_creating-machineset-vsphere[Creating a compute machine set]
 
 include::modules/references-regions-zones-infrastructure-vsphere.adoc[leveloffset=+1]
diff --git a/installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc b/installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
index 4d82cb156909..f25bd26d4b89 100644
--- a/installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
+++ b/installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
@@ -110,7 +110,7 @@ For instructions about configuring registry storage so that it references the co
 
 include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
 
-You can add extra compute machines after the cluster installation is completed by following xref:../../../machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
+You can add extra compute machines after the cluster installation is completed by following xref:../../../machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
 
 include::modules/vsphere-anti-affinity.adoc[leveloffset=+1]
 
diff --git a/installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc b/installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
index cc9517615d2b..79a1f0998f3f 100644
--- a/installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
+++ b/installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
@@ -109,7 +109,7 @@ For instructions about configuring registry storage so that it references the co
 
 include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
 
-You can add extra compute machines after the cluster installation is completed by following xref:../../../machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
+You can add extra compute machines after the cluster installation is completed by following xref:../../../machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
 
 include::modules/vsphere-anti-affinity.adoc[leveloffset=+1]
 
diff --git a/installing/installing_vsphere/upi/installing-vsphere.adoc b/installing/installing_vsphere/upi/installing-vsphere.adoc
index 725c1538321a..a49a76462ca4 100644
--- a/installing/installing_vsphere/upi/installing-vsphere.adoc
+++ b/installing/installing_vsphere/upi/installing-vsphere.adoc
@@ -96,7 +96,7 @@ For instructions about configuring registry storage so that it references the co
 
 include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
 
-You can add extra compute machines after the cluster installation is completed by following xref:../../../machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
+You can add extra compute machines after the cluster installation is completed by following xref:../../../machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere].
 
 include::modules/vsphere-anti-affinity.adoc[leveloffset=+1]
 
diff --git a/installing/overview/installing-fips.adoc b/installing/overview/installing-fips.adoc
index 1ddaeb96cfa1..20c847f95d03 100644
--- a/installing/overview/installing-fips.adoc
+++ b/installing/overview/installing-fips.adoc
@@ -111,4 +111,4 @@ If you are using Azure File storage, you cannot enable FIPS mode.
 
 To apply `AES CBC` encryption to your etcd data store, follow the xref:../../security/encrypting-etcd.adoc#encrypting-etcd[Encrypting etcd data] process after you install your cluster.
 
-If you add {op-system-base} nodes to your cluster, ensure that you enable FIPS mode on the machines before their initial boot. See xref:../../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding RHEL compute machines to an {product-title} cluster] and link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/security_hardening/assembly_installing-the-system-in-fips-mode_security-hardening[Installing the system in FIPS mode].
+If you add {op-system-base} nodes to your cluster, ensure that you enable FIPS mode on the machines before their initial boot. See xref:../../machine_management/manual_machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding RHEL compute machines to an {product-title} cluster] and link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/security_hardening/assembly_installing-the-system-in-fips-mode_security-hardening[Installing the system in FIPS mode].
diff --git a/machine_management/user_infra/_attributes b/machine_management/compute_machine_management/_attributes
similarity index 100%
rename from machine_management/user_infra/_attributes
rename to machine_management/compute_machine_management/_attributes
diff --git a/machine_management/applying-autoscaling.adoc b/machine_management/compute_machine_management/applying-autoscaling.adoc
similarity index 71%
rename from machine_management/applying-autoscaling.adoc
rename to machine_management/compute_machine_management/applying-autoscaling.adoc
index 182839a6798f..3153fbd0de03 100644
--- a/machine_management/applying-autoscaling.adoc
+++ b/machine_management/compute_machine_management/applying-autoscaling.adoc
@@ -33,7 +33,7 @@ include::modules/cluster-autoscaler-config-priority-expander.adoc[leveloffset=+3
 :FeatureResourceName: ClusterAutoscaler
 include::modules/deploying-resource.adoc[leveloffset=+2]
 .Next steps
-* After you configure the cluster autoscaler, you must xref:../machine_management/applying-autoscaling.adoc#configuring-machineautoscaler_applying-autoscaling[configure at least one machine autoscaler].
+* After you configure the cluster autoscaler, you must xref:../../machine_management/compute_machine_management/applying-autoscaling.adoc#configuring-machineautoscaler_applying-autoscaling[configure at least one machine autoscaler].
 
 include::modules/machine-autoscaler-about.adoc[leveloffset=+1]
 
@@ -66,16 +66,16 @@ You can disable an individual machine autoscaler in your cluster or disable auto
 include::modules/deleting-machine-autoscaler.adoc[leveloffset=+2]
 [role="_additional-resources"]
 .Additional resources
-* xref:../machine_management/applying-autoscaling.adoc#deleting-cluster-autoscaler_applying-autoscaling[Disabling the cluster autoscaler]
-* xref:../machine_management/applying-autoscaling.adoc#MachineAutoscaler-deploying_applying-autoscaling[Deploying a machine autoscaler]
+* xref:../../machine_management/compute_machine_management/applying-autoscaling.adoc#deleting-cluster-autoscaler_applying-autoscaling[Disabling the cluster autoscaler]
+* xref:../../machine_management/compute_machine_management/applying-autoscaling.adoc#MachineAutoscaler-deploying_applying-autoscaling[Deploying a machine autoscaler]
 
 include::modules/deleting-cluster-autoscaler.adoc[leveloffset=+2]
 [role="_additional-resources"]
 .Additional resources
-* xref:../machine_management/applying-autoscaling.adoc#deleting-machine-autoscaler_applying-autoscaling[Disabling the machine autoscaler]
-* xref:../machine_management/applying-autoscaling.adoc#ClusterAutoscaler-deploying_applying-autoscaling[Deploying a cluster autoscaler]
+* xref:../../machine_management/compute_machine_management/applying-autoscaling.adoc#deleting-machine-autoscaler_applying-autoscaling[Disabling the machine autoscaler]
+* xref:../../machine_management/compute_machine_management/applying-autoscaling.adoc#ClusterAutoscaler-deploying_applying-autoscaling[Deploying a cluster autoscaler]
 
 [role="_additional-resources"]
 == Additional resources
 
-* xref:../nodes/pods/nodes-pods-priority.adoc#nodes-pods-priority[Including pod priority in pod scheduling decisions in {product-title}]
+* xref:../../nodes/pods/nodes-pods-priority.adoc#nodes-pods-priority[Including pod priority in pod scheduling decisions in {product-title}]
diff --git a/machine_management/user_infra/images b/machine_management/compute_machine_management/images
similarity index 100%
rename from machine_management/user_infra/images
rename to machine_management/compute_machine_management/images
diff --git a/machine_management/compute_machine_management/mapi-compute-about.adoc b/machine_management/compute_machine_management/mapi-compute-about.adoc
new file mode 100644
index 000000000000..96b6fe23a9e0
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi-compute-about.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-about"]
+= About control plane machine sets
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-about
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi-compute-configuration.adoc b/machine_management/compute_machine_management/mapi-compute-configuration.adoc
new file mode 100644
index 000000000000..970c13a102ae
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi-compute-configuration.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-configuration"]
+= Control plane machine set configuration
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-configuration
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi-compute-disabling.adoc b/machine_management/compute_machine_management/mapi-compute-disabling.adoc
new file mode 100644
index 000000000000..ffc9ad6f85da
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi-compute-disabling.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-disabling"]
+= Disabling the control plane machine set
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-disabling
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi-compute-getting-started.adoc b/machine_management/compute_machine_management/mapi-compute-getting-started.adoc
new file mode 100644
index 000000000000..f7225c389156
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi-compute-getting-started.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-getting-started"]
+= Getting started with control plane machine sets
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-getting-started
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi-compute-managing-machines.adoc b/machine_management/compute_machine_management/mapi-compute-managing-machines.adoc
new file mode 100644
index 000000000000..d59f582d7eff
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi-compute-managing-machines.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-managing-machines"]
+= Managing control plane machines with control plane machine sets
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-managing-machines
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi-compute-resiliency.adoc b/machine_management/compute_machine_management/mapi-compute-resiliency.adoc
new file mode 100644
index 000000000000..0cece2538cda
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi-compute-resiliency.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-resiliency"]
+= Control plane resiliency and recovery
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-resiliency
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi-compute-troubleshooting.adoc b/machine_management/compute_machine_management/mapi-compute-troubleshooting.adoc
new file mode 100644
index 000000000000..98111197b83b
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi-compute-troubleshooting.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-troubleshooting"]
+= Troubleshooting the control plane machine set
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-troubleshooting
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_managing_machines/_attributes b/machine_management/compute_machine_management/mapi_compute_managing_machines/_attributes
new file mode 120000
index 000000000000..20cc1dcb77bf
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_managing_machines/_attributes
@@ -0,0 +1 @@
+../../_attributes/
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_managing_machines/images b/machine_management/compute_machine_management/mapi_compute_managing_machines/images
new file mode 120000
index 000000000000..847b03ed0541
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_managing_machines/images
@@ -0,0 +1 @@
+../../images/
\ No newline at end of file
diff --git a/machine_management/manually-scaling-machineset.adoc b/machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc
similarity index 61%
rename from machine_management/manually-scaling-machineset.adoc
rename to machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc
index aad837de207c..09abf4fe2da6 100644
--- a/machine_management/manually-scaling-machineset.adoc
+++ b/machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc
@@ -10,12 +10,12 @@ You can add or remove an instance of a machine in a compute machine set.
 
 [NOTE]
 ====
-If you need to modify aspects of a compute machine set outside of scaling, see xref:../machine_management/modifying-machineset.adoc#modifying-machineset[Modifying a compute machine set].
+If you need to modify aspects of a compute machine set outside of scaling, see xref:../../../machine_management/compute_machine_management/mapi_compute_managing_machines/modifying-machineset.adoc#modifying-machineset[Modifying a compute machine set].
 ====
 
 == Prerequisites
 
-* If you enabled the cluster-wide proxy and scale up compute machines not included in `networking.machineNetwork[].cidr` from the installation configuration, you must xref:../networking/enable-cluster-wide-proxy.adoc#nw-proxy-configure-object_config-cluster-wide-proxy[add the compute machines to the Proxy object's `noProxy` field] to prevent connection issues.
+* If you enabled the cluster-wide proxy and scale up compute machines not included in `networking.machineNetwork[].cidr` from the installation configuration, you must xref:../../../networking/enable-cluster-wide-proxy.adoc#nw-proxy-configure-object_config-cluster-wide-proxy[add the compute machines to the Proxy object's `noProxy` field] to prevent connection issues.
 
 include::modules/machine-user-provisioned-limitations.adoc[leveloffset=+1]
 
@@ -26,4 +26,4 @@ include::modules/machineset-delete-policy.adoc[leveloffset=+1]
 [role="_additional-resources"]
 [id="additional-resources_manually-scaling-machineset"]
 == Additional resources
-* xref:../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion_deleting-machine[Lifecycle hooks for the machine deletion phase]
\ No newline at end of file
+* xref:../../../machine_management/manual_machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion_deleting-machine[Lifecycle hooks for the machine deletion phase]
\ No newline at end of file
diff --git a/machine_management/modifying-machineset.adoc b/machine_management/compute_machine_management/mapi_compute_managing_machines/modifying-machineset.adoc
similarity index 57%
rename from machine_management/modifying-machineset.adoc
rename to machine_management/compute_machine_management/mapi_compute_managing_machines/modifying-machineset.adoc
index 0b11ef19715f..d9e855c2e91c 100644
--- a/machine_management/modifying-machineset.adoc
+++ b/machine_management/compute_machine_management/mapi_compute_managing_machines/modifying-machineset.adoc
@@ -10,7 +10,7 @@ You can modify a compute machine set, such as adding labels, changing the instan
 
 [NOTE]
 ====
-If you need to scale a compute machine set without making other changes, see xref:../machine_management/manually-scaling-machineset.adoc#manually-scaling-machineset[Manually scaling a compute machine set].
+If you need to scale a compute machine set without making other changes, see xref:../../../machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc#manually-scaling-machineset[Manually scaling a compute machine set].
 ====
 
 //Modifying a compute machine set by using the CLI
@@ -19,6 +19,6 @@ include::modules/machineset-modifying.adoc[leveloffset=+1,tag=!CAPI]
 
 [role="_additional-resources"]
 .Additional resources
-* xref:../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion_deleting-machine[Lifecycle hooks for the machine deletion phase]
-* xref:../machine_management/manually-scaling-machineset.adoc#machineset-manually-scaling_manually-scaling-machineset[Scaling a compute machine set manually]
-* xref:../nodes/scheduling/nodes-scheduler-about.adoc#nodes-scheduler-about[Controlling pod placement using the scheduler]
+* xref:../../../machine_management/manual_machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion_deleting-machine[Lifecycle hooks for the machine deletion phase]
+* xref:../../../machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc#machineset-manually-scaling_manually-scaling-machineset[Scaling a compute machine set manually]
+* xref:../../../nodes/scheduling/nodes-scheduler-about.adoc#nodes-scheduler-about[Controlling pod placement using the scheduler]
diff --git a/machine_management/user_infra/modules b/machine_management/compute_machine_management/mapi_compute_managing_machines/modules
similarity index 100%
rename from machine_management/user_infra/modules
rename to machine_management/compute_machine_management/mapi_compute_managing_machines/modules
diff --git a/machine_management/user_infra/snippets b/machine_management/compute_machine_management/mapi_compute_managing_machines/snippets
similarity index 100%
rename from machine_management/user_infra/snippets
rename to machine_management/compute_machine_management/mapi_compute_managing_machines/snippets
diff --git a/machine_management/compute_machine_management/mapi_compute_provider_configurations/_attributes b/machine_management/compute_machine_management/mapi_compute_provider_configurations/_attributes
new file mode 120000
index 000000000000..20cc1dcb77bf
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_provider_configurations/_attributes
@@ -0,0 +1 @@
+../../_attributes/
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_provider_configurations/images b/machine_management/compute_machine_management/mapi_compute_provider_configurations/images
new file mode 120000
index 000000000000..847b03ed0541
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_provider_configurations/images
@@ -0,0 +1 @@
+../../images/
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-aws.adoc b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-aws.adoc
new file mode 100644
index 000000000000..2226d787ed29
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-aws.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-config-options-aws"]
+= Control plane configuration options for Amazon Web Services
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-config-options-aws
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-azure.adoc b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-azure.adoc
new file mode 100644
index 000000000000..0bcd27003a45
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-azure.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-config-options-azure"]
+= Control plane configuration options for Microsoft Azure
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-config-options-azure
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-gcp.adoc b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-gcp.adoc
new file mode 100644
index 000000000000..ff71b16f9e3f
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-gcp.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-config-options-gcp"]
+= Control plane configuration options for Google Cloud Platform
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-config-options-gcp
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-nutanix.adoc b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-nutanix.adoc
new file mode 100644
index 000000000000..a171d39406bf
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-nutanix.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-config-options-nutanix"]
+= Control plane configuration options for Nutanix
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-config-options-nutanix
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-openstack.adoc b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-openstack.adoc
new file mode 100644
index 000000000000..8f72cc7e9240
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-openstack.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-config-options-openstack"]
+= Control plane configuration options for Red Hat OpenStack Platform
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-config-options-openstack
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-vsphere.adoc b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-vsphere.adoc
new file mode 100644
index 000000000000..4b1c07e910e5
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_provider_configurations/mapi-compute-config-options-vsphere.adoc
@@ -0,0 +1,9 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="mapi-compute-config-options-vsphere"]
+= Control plane configuration options for VMware vSphere
+include::_attributes/common-attributes.adoc[]
+:context: mapi-compute-config-options-vsphere
+
+toc::[]
+
+Placeholder assembly.
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_provider_configurations/modules b/machine_management/compute_machine_management/mapi_compute_provider_configurations/modules
new file mode 120000
index 000000000000..36719b9de743
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_provider_configurations/modules
@@ -0,0 +1 @@
+../../modules/
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/mapi_compute_provider_configurations/snippets b/machine_management/compute_machine_management/mapi_compute_provider_configurations/snippets
new file mode 120000
index 000000000000..5a3f5add140e
--- /dev/null
+++ b/machine_management/compute_machine_management/mapi_compute_provider_configurations/snippets
@@ -0,0 +1 @@
+../../snippets/
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/modules b/machine_management/compute_machine_management/modules
new file mode 120000
index 000000000000..36719b9de743
--- /dev/null
+++ b/machine_management/compute_machine_management/modules
@@ -0,0 +1 @@
+../../modules/
\ No newline at end of file
diff --git a/machine_management/compute_machine_management/snippets b/machine_management/compute_machine_management/snippets
new file mode 120000
index 000000000000..5a3f5add140e
--- /dev/null
+++ b/machine_management/compute_machine_management/snippets
@@ -0,0 +1 @@
+../../snippets/
\ No newline at end of file
diff --git a/machine_management/control_plane_machine_management/cpmso-resiliency.adoc b/machine_management/control_plane_machine_management/cpmso-resiliency.adoc
index 57a08b2b99c6..54074c39c3a3 100644
--- a/machine_management/control_plane_machine_management/cpmso-resiliency.adoc
+++ b/machine_management/control_plane_machine_management/cpmso-resiliency.adoc
@@ -45,4 +45,4 @@ include::modules/cpmso-control-plane-recovery.adoc[leveloffset=+1]
 include::modules/machine-lifecycle-hook-deletion-etcd.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
-* xref:../../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion_deleting-machine[Lifecycle hooks for the machine deletion phase]
+* xref:../../machine_management/manual_machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion_deleting-machine[Lifecycle hooks for the machine deletion phase]
diff --git a/machine_management/creating-infrastructure-machinesets.adoc b/machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
similarity index 61%
rename from machine_management/creating-infrastructure-machinesets.adoc
rename to machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
index 8c965e522384..6d30bb9301cc 100644
--- a/machine_management/creating-infrastructure-machinesets.adoc
+++ b/machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
@@ -16,7 +16,7 @@ include::modules/infrastructure-components.adoc[leveloffset=+1]
 
 For information about infrastructure nodes and which components can run on infrastructure nodes, see the "Red Hat OpenShift control plane and infrastructure nodes" section in the link:https://www.redhat.com/en/resources/openshift-subscription-sizing-guide[OpenShift sizing and subscription guide for enterprise Kubernetes] document.
 
-To create an infrastructure node, you can xref:../machine_management/creating-infrastructure-machinesets.adoc#machineset-creating_creating-infrastructure-machinesets[use a machine set], xref:../machine_management/creating-infrastructure-machinesets.adoc#creating-an-infra-node_creating-infrastructure-machinesets[label the node], or xref:../machine_management/creating-infrastructure-machinesets.adoc#creating-infra-machines_creating-infrastructure-machinesets[use a machine config pool].
+To create an infrastructure node, you can xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#machineset-creating_creating-infrastructure-machinesets[use a machine set], xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-an-infra-node_creating-infrastructure-machinesets[label the node], or xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infra-machines_creating-infrastructure-machinesets[use a machine config pool].
 
 [id="creating-infrastructure-machinesets-production"]
 == Creating infrastructure machine sets for production environments
@@ -30,16 +30,16 @@ Use the sample compute machine set for your cloud.
 
 include::modules/machineset-yaml-aws.adoc[leveloffset=+3]
 
-Machine sets running on AWS support non-guaranteed xref:../machine_management/creating_machinesets/creating-machineset-aws.adoc#machineset-non-guaranteed-instance_creating-machineset-aws[Spot Instances]. You can save on costs by using Spot Instances at a lower price compared to
-On-Demand Instances on AWS. xref:../machine_management/creating_machinesets/creating-machineset-aws.adoc#machineset-creating-non-guaranteed-instance_creating-machineset-aws[Configure Spot Instances] by adding `spotMarketOptions` to the `MachineSet` YAML file.
+Machine sets running on AWS support non-guaranteed xref:../../machine_management/creating_machinesets/creating-machineset-aws.adoc#machineset-non-guaranteed-instance_creating-machineset-aws[Spot Instances]. You can save on costs by using Spot Instances at a lower price compared to
+On-Demand Instances on AWS. xref:../../machine_management/creating_machinesets/creating-machineset-aws.adoc#machineset-creating-non-guaranteed-instance_creating-machineset-aws[Configure Spot Instances] by adding `spotMarketOptions` to the `MachineSet` YAML file.
 
 include::modules/machineset-yaml-azure.adoc[leveloffset=+3]
 
-Machine sets running on Azure support non-guaranteed xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-non-guaranteed-instance_creating-machineset-azure[Spot VMs]. You can save on costs by using Spot VMs at a lower price compared to standard VMs on Azure. You can xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-creating-non-guaranteed-instance_creating-machineset-azure[configure Spot VMs] by adding `spotVMOptions` to the `MachineSet` YAML file.
+Machine sets running on Azure support non-guaranteed xref:../../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-non-guaranteed-instance_creating-machineset-azure[Spot VMs]. You can save on costs by using Spot VMs at a lower price compared to standard VMs on Azure. You can xref:../../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-creating-non-guaranteed-instance_creating-machineset-azure[configure Spot VMs] by adding `spotVMOptions` to the `MachineSet` YAML file.
 
 [role="_additional-resources"]
 .Additional resources
-* xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc#installation-azure-marketplace-subscribe_creating-machineset-azure[Selecting an Azure Marketplace image]
+* xref:../../machine_management/creating_machinesets/creating-machineset-azure.adoc#installation-azure-marketplace-subscribe_creating-machineset-azure[Selecting an Azure Marketplace image]
 
 include::modules/machineset-yaml-azure-stack-hub.adoc[leveloffset=+3]
 
@@ -52,8 +52,8 @@ include::modules/machineset-yaml-ibm-cloud.adoc[leveloffset=+3]
 
 include::modules/machineset-yaml-gcp.adoc[leveloffset=+3]
 
-Machine sets running on GCP support non-guaranteed xref:../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-non-guaranteed-instance_creating-machineset-gcp[preemptible VM instances]. You can save on costs by using preemptible VM instances at a lower price
-compared to normal instances on GCP. You can xref:../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-creating-non-guaranteed-instance_creating-machineset-gcp[configure preemptible VM instances] by adding `preemptible` to the `MachineSet` YAML file.
+Machine sets running on GCP support non-guaranteed xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-non-guaranteed-instance_creating-machineset-gcp[preemptible VM instances]. You can save on costs by using preemptible VM instances at a lower price
+compared to normal instances on GCP. You can xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-creating-non-guaranteed-instance_creating-machineset-gcp[configure preemptible VM instances] by adding `preemptible` to the `MachineSet` YAML file.
 
 include::modules/machineset-yaml-nutanix.adoc[leveloffset=+3]
 
@@ -75,7 +75,7 @@ include::modules/creating-infra-machines.adoc[leveloffset=+2]
 [role="_additional-resources"]
 .Additional resources
 
-* See xref:../architecture/control-plane.adoc#architecture-machine-config-pools_control-plane[Node configuration management with machine config pools] for more information on grouping infra machines in a custom pool.
+* See xref:../../architecture/control-plane.adoc#architecture-machine-config-pools_control-plane[Node configuration management with machine config pools] for more information on grouping infra machines in a custom pool.
 
 [id="assigning-machineset-resources-to-infra-nodes"]
 == Assigning machine set resources to infrastructure nodes
@@ -89,9 +89,9 @@ include::modules/binding-infra-node-workloads-using-taints-tolerations.adoc[leve
 [role="_additional-resources"]
 .Additional resources
 
-* See xref:../nodes/scheduling/nodes-scheduler-about.adoc#nodes-scheduler-about[Controlling pod placement using the scheduler] for general information on scheduling a pod to a node.
+* See xref:../../nodes/scheduling/nodes-scheduler-about.adoc#nodes-scheduler-about[Controlling pod placement using the scheduler] for general information on scheduling a pod to a node.
 * See xref:moving-resources-to-infrastructure-machinesets[Moving resources to infrastructure machine sets] for instructions on scheduling pods to infra nodes.
-* See xref:../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-about_nodes-scheduler-taints-tolerations[Understanding taints and tolerations] for more details about different effects of taints.
+* See xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-about_nodes-scheduler-taints-tolerations[Understanding taints and tolerations] for more details about different effects of taints.
 
 [id="moving-resources-to-infrastructure-machinesets"]
 == Moving resources to infrastructure machine sets
@@ -115,7 +115,7 @@ spec:
 ----
 <1> Add a `nodeSelector` parameter with the appropriate value to the component you want to move. You can use a `nodeSelector` in the format shown or use `<key>: <value>` pairs, based on the value specified for the node.  If you added a taint to the infrasructure node, also add a matching toleration.
 
-Applying a specific node selector to all infrastructure components causes {product-title} to xref:../machine_management/creating-infrastructure-machinesets.adoc#moving-resources-to-infrastructure-machinesets[schedule those workloads on nodes with that label].
+Applying a specific node selector to all infrastructure components causes {product-title} to xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#moving-resources-to-infrastructure-machinesets[schedule those workloads on nodes with that label].
 
 include::modules/infrastructure-moving-router.adoc[leveloffset=+2]
 
@@ -129,6 +129,6 @@ include::modules/nodes-cluster-resource-override-move-infra.adoc[leveloffset=+2]
 
 [role="_additional-resources"]
 .Additional resources
-* xref:../observability/monitoring/configuring-the-monitoring-stack.adoc#moving-monitoring-components-to-different-nodes_configuring-the-monitoring-stack[Moving monitoring components to different nodes]
-* xref:../observability/logging/scheduling_resources/logging-node-selectors.adoc#logging-node-selectors[Using node selectors to move logging resources]
-* xref:../observability/logging/scheduling_resources/logging-taints-tolerations.adoc#cluster-logging-logstore-tolerations_logging-taints-tolerations[Using taints and tolerations to control logging pod placement]
+* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#moving-monitoring-components-to-different-nodes_configuring-the-monitoring-stack[Moving monitoring components to different nodes]
+* xref:../../observability/logging/scheduling_resources/logging-node-selectors.adoc#logging-node-selectors[Using node selectors to move logging resources]
+* xref:../../observability/logging/scheduling_resources/logging-taints-tolerations.adoc#cluster-logging-logstore-tolerations_logging-taints-tolerations[Using taints and tolerations to control logging pod placement]
diff --git a/machine_management/creating_machinesets/creating-machineset-azure.adoc b/machine_management/creating_machinesets/creating-machineset-azure.adoc
index 7e71b17a226b..c2dc517cb6e7 100644
--- a/machine_management/creating_machinesets/creating-machineset-azure.adoc
+++ b/machine_management/creating_machinesets/creating-machineset-azure.adoc
@@ -81,4 +81,4 @@ include::modules/machineset-azure-enabling-accelerated-networking-existing.adoc[
 
 [role="_additional-resources"]
 .Additional resources
-* xref:../../machine_management/manually-scaling-machineset.adoc#manually-scaling-machineset[Manually scaling a compute machine set]
+* xref:../../machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc#manually-scaling-machineset[Manually scaling a compute machine set]
diff --git a/machine_management/index.adoc b/machine_management/index.adoc
index bde131ba789e..d7af23ef3841 100644
--- a/machine_management/index.adoc
+++ b/machine_management/index.adoc
@@ -55,13 +55,13 @@ As a cluster administrator, you can perform the following actions:
 
 * Create a machine set for a bare metal deployment: xref:../machine_management/creating_machinesets/creating-machineset-bare-metal.adoc#creating-machineset-bare-metal[Creating a compute machine set on bare metal]
 
-* xref:../machine_management/manually-scaling-machineset.adoc#manually-scaling-machineset[Manually scale a compute machine set] by adding or removing a machine from the compute machine set.
+* xref:../machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc#manually-scaling-machineset[Manually scale a compute machine set] by adding or removing a machine from the compute machine set.
 
-* xref:../machine_management/modifying-machineset.adoc#modifying-machineset[Modify a compute machine set] through the `MachineSet` YAML configuration file.
+* xref:../machine_management/compute_machine_management/mapi_compute_managing_machines/modifying-machineset.adoc#modifying-machineset[Modify a compute machine set] through the `MachineSet` YAML configuration file.
 
-* xref:../machine_management/deleting-machine.adoc#deleting-machine[Delete] a machine.
+* xref:../machine_management/manual_machine_management/deleting-machine.adoc#deleting-machine[Delete] a machine.
 
-* xref:../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Create infrastructure compute machine sets].
+* xref:../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Create infrastructure compute machine sets].
 
 * Configure and deploy a xref:../machine_management/deploying-machine-health-checks.adoc#deploying-machine-health-checks[machine health check] to automatically fix damaged machines in a machine pool.
 
@@ -89,21 +89,21 @@ As a cluster administrator, you can perform the following actions:
 [id="machine-mgmt-intro-autoscaling_{context}"]
 == Applying autoscaling to an {product-title} cluster
 
-You can automatically scale your {product-title} cluster to ensure flexibility for changing workloads. To xref:../machine_management/applying-autoscaling.adoc#applying-autoscaling[autoscale] your cluster, you must first deploy a cluster autoscaler, and then deploy a machine autoscaler for each compute machine set.
+You can automatically scale your {product-title} cluster to ensure flexibility for changing workloads. To xref:../machine_management/compute_machine_management/applying-autoscaling.adoc#applying-autoscaling[autoscale] your cluster, you must first deploy a cluster autoscaler, and then deploy a machine autoscaler for each compute machine set.
 
-* The xref:../machine_management/applying-autoscaling.adoc#cluster-autoscaler-about_applying-autoscaling[_cluster autoscaler_] increases and decreases the size of the cluster based on deployment needs.
+* The xref:../machine_management/compute_machine_management/applying-autoscaling.adoc#cluster-autoscaler-about_applying-autoscaling[_cluster autoscaler_] increases and decreases the size of the cluster based on deployment needs.
 
-* The xref:../machine_management/applying-autoscaling.adoc#machine-autoscaler-about_applying-autoscaling[_machine autoscaler_] adjusts the number of machines in the compute machine sets that you deploy in your {product-title} cluster.
+* The xref:../machine_management/compute_machine_management/applying-autoscaling.adoc#machine-autoscaler-about_applying-autoscaling[_machine autoscaler_] adjusts the number of machines in the compute machine sets that you deploy in your {product-title} cluster.
 
 [id="machine-mgmt-intro-add-for-upi_{context}"]
 == Adding compute machines on user-provisioned infrastructure
-User-provisioned infrastructure is an environment where you can deploy infrastructure such as compute, network, and storage resources that host the {product-title}. You can xref:../machine_management/user_infra/adding-compute-user-infra-general.adoc#adding-compute-user-infra-general[add compute machines] to a cluster on user-provisioned infrastructure during or after the installation process.
+User-provisioned infrastructure is an environment where you can deploy infrastructure such as compute, network, and storage resources that host the {product-title}. You can xref:../machine_management/manual_machine_management/user_infra/adding-compute-user-infra-general.adoc#adding-compute-user-infra-general[add compute machines] to a cluster on user-provisioned infrastructure during or after the installation process.
 
 [id="machine-mgmt-intro-add-rhel_{context}"]
 == Adding RHEL compute machines to your cluster
 
 As a cluster administrator, you can perform the following actions:
 
-** xref:../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Add Red Hat Enterprise Linux (RHEL) compute machines], also known as worker machines, to a user-provisioned infrastructure cluster or an installation-provisioned infrastructure cluster.
+** xref:../machine_management/manual_machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Add Red Hat Enterprise Linux (RHEL) compute machines], also known as worker machines, to a user-provisioned infrastructure cluster or an installation-provisioned infrastructure cluster.
 
-** xref:../machine_management/more-rhel-compute.adoc#more-rhel-compute[Add more Red Hat Enterprise Linux (RHEL) compute machines] to an existing cluster.
+** xref:../machine_management/manual_machine_management/more-rhel-compute.adoc#more-rhel-compute[Add more Red Hat Enterprise Linux (RHEL) compute machines] to an existing cluster.
diff --git a/machine_management/machine-phases-lifecycle.adoc b/machine_management/machine-phases-lifecycle.adoc
index 67e4a9a2e73c..786105a3ba7b 100644
--- a/machine_management/machine-phases-lifecycle.adoc
+++ b/machine_management/machine-phases-lifecycle.adoc
@@ -28,4 +28,4 @@ include::modules/machine-determine-phase-gui.adoc[leveloffset=+2]
 [role="_additional-resources"]
 == Additional resources
 
-* xref:../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion_deleting-machine[Lifecycle hooks for the machine deletion phase]
\ No newline at end of file
+* xref:../machine_management/manual_machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion_deleting-machine[Lifecycle hooks for the machine deletion phase]
\ No newline at end of file
diff --git a/machine_management/manual_machine_management/_attributes b/machine_management/manual_machine_management/_attributes
new file mode 120000
index 000000000000..20cc1dcb77bf
--- /dev/null
+++ b/machine_management/manual_machine_management/_attributes
@@ -0,0 +1 @@
+../../_attributes/
\ No newline at end of file
diff --git a/machine_management/adding-rhel-compute.adoc b/machine_management/manual_machine_management/adding-rhel-compute.adoc
similarity index 80%
rename from machine_management/adding-rhel-compute.adoc
rename to machine_management/manual_machine_management/adding-rhel-compute.adoc
index 04bf6523119e..ed250993e881 100644
--- a/machine_management/adding-rhel-compute.adoc
+++ b/machine_management/manual_machine_management/adding-rhel-compute.adoc
@@ -15,8 +15,8 @@ include::modules/rhel-compute-requirements.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-deleting_nodes-nodes-working[Deleting nodes]
-* xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-azure-accelerated-networking_creating-machineset-azure[Accelerated Networking for Microsoft Azure VMs]
+* xref:../../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-deleting_nodes-nodes-working[Deleting nodes]
+* xref:../../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-azure-accelerated-networking_creating-machineset-azure[Accelerated Networking for Microsoft Azure VMs]
 
 include::modules/csr-management.adoc[leveloffset=+2]
 
@@ -39,7 +39,7 @@ include::modules/rhel-attaching-instance-aws.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
-* See xref:../installing/installing_aws/installing-aws-account.adoc#installation-aws-permissions-iam-roles_installing-aws-account[Required AWS permissions for IAM roles].
+* See xref:../../installing/installing_aws/installing-aws-account.adoc#installation-aws-permissions-iam-roles_installing-aws-account[Required AWS permissions for IAM roles].
 
 include::modules/rhel-worker-tag.adoc[leveloffset=+1]
 
diff --git a/machine_management/deleting-machine.adoc b/machine_management/manual_machine_management/deleting-machine.adoc
similarity index 65%
rename from machine_management/deleting-machine.adoc
rename to machine_management/manual_machine_management/deleting-machine.adoc
index 2235cfd6136a..d340f8ab85c1 100644
--- a/machine_management/deleting-machine.adoc
+++ b/machine_management/manual_machine_management/deleting-machine.adoc
@@ -28,6 +28,6 @@ include::modules/machine-lifecycle-hook-deletion-etcd.adoc[leveloffset=+2]
 [id="additional-resources_unhealthy-etcd-member"]
 == Additional resources
 
-* xref:../machine_management/machine-phases-lifecycle.adoc#machine-phases-lifecycle[Machine phases and lifecycle]
-* xref:../backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc#replacing-unhealthy-etcd-member[Replacing an unhealthy etcd member]
-* xref:../machine_management/control_plane_machine_management/cpmso-managing-machines.adoc#cpmso-managing-machines[Managing control plane machines with control plane machine sets]
\ No newline at end of file
+* xref:../../machine_management/machine-phases-lifecycle.adoc#machine-phases-lifecycle[Machine phases and lifecycle]
+* xref:../../backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc#replacing-unhealthy-etcd-member[Replacing an unhealthy etcd member]
+* xref:../../machine_management/control_plane_machine_management/cpmso-managing-machines.adoc#cpmso-managing-machines[Managing control plane machines with control plane machine sets]
\ No newline at end of file
diff --git a/machine_management/manual_machine_management/images b/machine_management/manual_machine_management/images
new file mode 120000
index 000000000000..847b03ed0541
--- /dev/null
+++ b/machine_management/manual_machine_management/images
@@ -0,0 +1 @@
+../../images/
\ No newline at end of file
diff --git a/machine_management/manual_machine_management/modules b/machine_management/manual_machine_management/modules
new file mode 120000
index 000000000000..36719b9de743
--- /dev/null
+++ b/machine_management/manual_machine_management/modules
@@ -0,0 +1 @@
+../../modules/
\ No newline at end of file
diff --git a/machine_management/more-rhel-compute.adoc b/machine_management/manual_machine_management/more-rhel-compute.adoc
similarity index 79%
rename from machine_management/more-rhel-compute.adoc
rename to machine_management/manual_machine_management/more-rhel-compute.adoc
index be01a0a78066..67670e4024fd 100644
--- a/machine_management/more-rhel-compute.adoc
+++ b/machine_management/manual_machine_management/more-rhel-compute.adoc
@@ -15,8 +15,8 @@ include::modules/rhel-compute-requirements.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-deleting_nodes-nodes-working[Deleting nodes]
-* xref:../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-azure-accelerated-networking_creating-machineset-azure[Accelerated Networking for Microsoft Azure VMs]
+* xref:../../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-deleting_nodes-nodes-working[Deleting nodes]
+* xref:../../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-azure-accelerated-networking_creating-machineset-azure[Accelerated Networking for Microsoft Azure VMs]
 
 include::modules/csr-management.adoc[leveloffset=+2]
 
@@ -37,7 +37,7 @@ include::modules/rhel-attaching-instance-aws.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
-* See xref:../installing/installing_aws/installing-aws-account.adoc#installation-aws-permissions-iam-roles_installing-aws-account[Required AWS permissions for IAM roles].
+* See xref:../../installing/installing_aws/installing-aws-account.adoc#installation-aws-permissions-iam-roles_installing-aws-account[Required AWS permissions for IAM roles].
 
 include::modules/rhel-worker-tag.adoc[leveloffset=+1]
 
diff --git a/machine_management/manual_machine_management/snippets b/machine_management/manual_machine_management/snippets
new file mode 120000
index 000000000000..5a3f5add140e
--- /dev/null
+++ b/machine_management/manual_machine_management/snippets
@@ -0,0 +1 @@
+../../snippets/
\ No newline at end of file
diff --git a/machine_management/manual_machine_management/user_infra/_attributes b/machine_management/manual_machine_management/user_infra/_attributes
new file mode 120000
index 000000000000..20cc1dcb77bf
--- /dev/null
+++ b/machine_management/manual_machine_management/user_infra/_attributes
@@ -0,0 +1 @@
+../../_attributes/
\ No newline at end of file
diff --git a/machine_management/user_infra/adding-aws-compute-user-infra.adoc b/machine_management/manual_machine_management/user_infra/adding-aws-compute-user-infra.adoc
similarity index 75%
rename from machine_management/user_infra/adding-aws-compute-user-infra.adoc
rename to machine_management/manual_machine_management/user_infra/adding-aws-compute-user-infra.adoc
index da6c1e6a7967..cbc1de3deb01 100644
--- a/machine_management/user_infra/adding-aws-compute-user-infra.adoc
+++ b/machine_management/manual_machine_management/user_infra/adding-aws-compute-user-infra.adoc
@@ -11,8 +11,8 @@ You can add more compute machines to your {product-title} cluster on Amazon Web
 [id="prerequisites_adding-aws-compute-user-infra"]
 == Prerequisites
 
-* You installed your cluster on AWS by using the provided xref:../../installing/installing_aws/upi/installing-aws-user-infra.adoc#installing-aws-user-infra[AWS CloudFormation templates].
-* You have the JSON file and CloudFormation template that you used to create the compute machines during cluster installation. If you do not have these files, you must recreate them by following the instructions in the xref:../../installing/installing_aws/upi/installing-aws-user-infra.adoc#installing-aws-user-infra[installation procedure].
+* You installed your cluster on AWS by using the provided xref:../../../installing/installing_aws/upi/installing-aws-user-infra.adoc#installing-aws-user-infra[AWS CloudFormation templates].
+* You have the JSON file and CloudFormation template that you used to create the compute machines during cluster installation. If you do not have these files, you must recreate them by following the instructions in the xref:../../../installing/installing_aws/upi/installing-aws-user-infra.adoc#installing-aws-user-infra[installation procedure].
 
 include::modules/machine-adding-aws-compute-cloudformation.adoc[leveloffset=+1]
 
diff --git a/machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc b/machine_management/manual_machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc
similarity index 89%
rename from machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc
rename to machine_management/manual_machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc
index a41991a0773a..d5b96a2dde23 100644
--- a/machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc
+++ b/machine_management/manual_machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc
@@ -10,8 +10,8 @@ You can add more compute machines to your {product-title} cluster on bare metal.
 
 == Prerequisites
 
-* You xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[installed a cluster on bare metal].
-* You have installation media and {op-system-first} images that you used to create your cluster. If you do not have these files, you must obtain them by following the instructions in the xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[installation procedure].
+* You xref:../../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[installed a cluster on bare metal].
+* You have installation media and {op-system-first} images that you used to create your cluster. If you do not have these files, you must obtain them by following the instructions in the xref:../../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[installation procedure].
 * If a DHCP server is available for your user-provisioned infrastructure, you have added the details for the additional compute machines to your DHCP server configuration. This includes a persistent IP address, DNS server information, and a hostname for each machine.
 * You have updated your DNS configuration to include the record name and IP address of each compute machine that you are adding. You have validated that DNS lookup and reverse DNS lookup resolve correctly.
 
diff --git a/machine_management/manual_machine_management/user_infra/adding-compute-user-infra-general.adoc b/machine_management/manual_machine_management/user_infra/adding-compute-user-infra-general.adoc
new file mode 100644
index 000000000000..8a4fb3733e00
--- /dev/null
+++ b/machine_management/manual_machine_management/user_infra/adding-compute-user-infra-general.adoc
@@ -0,0 +1,42 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="adding-compute-user-infra-general"]
+= Adding compute machines to clusters with user-provisioned infrastructure manually
+include::_attributes/common-attributes.adoc[]
+:context: adding-compute-user-infra-general
+
+toc::[]
+
+You can add compute machines to a cluster on user-provisioned infrastructure either as part of the installation process or after installation. The postinstallation process requires some of the same configuration files and parameters that were used during installation.
+
+[id="upi-adding-compute-aws"]
+== Adding compute machines to Amazon Web Services
+
+To add more compute machines to your {product-title} cluster on Amazon Web Services (AWS), see xref:../../../machine_management/manual_machine_management/user_infra/adding-aws-compute-user-infra.adoc#adding-aws-compute-user-infra[Adding compute machines to AWS by using CloudFormation templates].
+
+[id="upi-adding-compute-azure"]
+== Adding compute machines to Microsoft Azure
+
+To add more compute machines to your {product-title} cluster on Microsoft Azure, see xref:../../../installing/installing_azure/upi/installing-azure-user-infra.adoc#installation-creating-azure-worker_installing-azure-user-infra[Creating additional worker machines in Azure].
+
+[id="upi-adding-compute-ash"]
+== Adding compute machines to Azure Stack Hub
+
+To add more compute machines to your {product-title} cluster on Azure Stack Hub, see xref:../../../installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc#installation-creating-azure-worker_installing-azure-stack-hub-user-infra[Creating additional worker machines in Azure Stack Hub].
+
+[id="upi-adding-compute-gcp"]
+== Adding compute machines to Google Cloud Platform
+
+To add more compute machines to your {product-title} cluster on Google Cloud Platform (GCP), see xref:../../../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installation-creating-gcp-worker_installing-restricted-networks-gcp[Creating additional worker machines in GCP].
+
+[id="upi-adding-compute-vsphere"]
+== Adding compute machines to vSphere
+
+You can xref:../../../machine_management/creating_machinesets/creating-machineset-vsphere.adoc#creating-machineset-vsphere[use compute machine sets] to automate the creation of additional compute machines for your {product-title} cluster on vSphere.
+
+To manually add more compute machines to your cluster, see xref:../../../machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere manually].
+
+
+[id="upi-adding-compute-bare-metal"]
+== Adding compute machines to bare metal
+
+To add more compute machines to your {product-title} cluster on bare metal, see xref:../../../machine_management/manual_machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc#adding-bare-metal-compute-user-infra[Adding compute machines to bare metal].
diff --git a/machine_management/user_infra/adding-vsphere-compute-user-infra.adoc b/machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc
similarity index 68%
rename from machine_management/user_infra/adding-vsphere-compute-user-infra.adoc
rename to machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc
index c82b747042d5..88a10086000e 100644
--- a/machine_management/user_infra/adding-vsphere-compute-user-infra.adoc
+++ b/machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc
@@ -10,14 +10,14 @@ You can add more compute machines to your {product-title} cluster on VMware vSph
 
 [NOTE]
 ====
-You can also xref:../../machine_management/creating_machinesets/creating-machineset-vsphere.adoc#creating-machineset-vsphere[use compute machine sets] to automate the creation of additional VMware vSphere compute machines for your cluster.
+You can also xref:../../../machine_management/creating_machinesets/creating-machineset-vsphere.adoc#creating-machineset-vsphere[use compute machine sets] to automate the creation of additional VMware vSphere compute machines for your cluster.
 ====
 
 == Prerequisites
 
-* You xref:../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[installed a cluster on vSphere].
+* You xref:../../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[installed a cluster on vSphere].
 
-* You have installation media and {op-system-first} images that you used to create your cluster. If you do not have these files, you must obtain them by following the instructions in the xref:../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[installation procedure].
+* You have installation media and {op-system-first} images that you used to create your cluster. If you do not have these files, you must obtain them by following the instructions in the xref:../../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[installation procedure].
 
 [IMPORTANT]
 ====
diff --git a/machine_management/manual_machine_management/user_infra/images b/machine_management/manual_machine_management/user_infra/images
new file mode 120000
index 000000000000..847b03ed0541
--- /dev/null
+++ b/machine_management/manual_machine_management/user_infra/images
@@ -0,0 +1 @@
+../../images/
\ No newline at end of file
diff --git a/machine_management/manual_machine_management/user_infra/modules b/machine_management/manual_machine_management/user_infra/modules
new file mode 120000
index 000000000000..36719b9de743
--- /dev/null
+++ b/machine_management/manual_machine_management/user_infra/modules
@@ -0,0 +1 @@
+../../modules/
\ No newline at end of file
diff --git a/machine_management/manual_machine_management/user_infra/snippets b/machine_management/manual_machine_management/user_infra/snippets
new file mode 120000
index 000000000000..5a3f5add140e
--- /dev/null
+++ b/machine_management/manual_machine_management/user_infra/snippets
@@ -0,0 +1 @@
+../../snippets/
\ No newline at end of file
diff --git a/machine_management/user_infra/adding-compute-user-infra-general.adoc b/machine_management/user_infra/adding-compute-user-infra-general.adoc
deleted file mode 100644
index c5fcc931dbda..000000000000
--- a/machine_management/user_infra/adding-compute-user-infra-general.adoc
+++ /dev/null
@@ -1,42 +0,0 @@
-:_mod-docs-content-type: ASSEMBLY
-[id="adding-compute-user-infra-general"]
-= Adding compute machines to clusters with user-provisioned infrastructure manually
-include::_attributes/common-attributes.adoc[]
-:context: adding-compute-user-infra-general
-
-toc::[]
-
-You can add compute machines to a cluster on user-provisioned infrastructure either as part of the installation process or after installation. The postinstallation process requires some of the same configuration files and parameters that were used during installation.
-
-[id="upi-adding-compute-aws"]
-== Adding compute machines to Amazon Web Services
-
-To add more compute machines to your {product-title} cluster on Amazon Web Services (AWS), see xref:../../machine_management/user_infra/adding-aws-compute-user-infra.adoc#adding-aws-compute-user-infra[Adding compute machines to AWS by using CloudFormation templates].
-
-[id="upi-adding-compute-azure"]
-== Adding compute machines to Microsoft Azure
-
-To add more compute machines to your {product-title} cluster on Microsoft Azure, see xref:../../installing/installing_azure/upi/installing-azure-user-infra.adoc#installation-creating-azure-worker_installing-azure-user-infra[Creating additional worker machines in Azure].
-
-[id="upi-adding-compute-ash"]
-== Adding compute machines to Azure Stack Hub
-
-To add more compute machines to your {product-title} cluster on Azure Stack Hub, see xref:../../installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc#installation-creating-azure-worker_installing-azure-stack-hub-user-infra[Creating additional worker machines in Azure Stack Hub].
-
-[id="upi-adding-compute-gcp"]
-== Adding compute machines to Google Cloud Platform
-
-To add more compute machines to your {product-title} cluster on Google Cloud Platform (GCP), see xref:../../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installation-creating-gcp-worker_installing-restricted-networks-gcp[Creating additional worker machines in GCP].
-
-[id="upi-adding-compute-vsphere"]
-== Adding compute machines to vSphere
-
-You can xref:../../machine_management/creating_machinesets/creating-machineset-vsphere.adoc#creating-machineset-vsphere[use compute machine sets] to automate the creation of additional compute machines for your {product-title} cluster on vSphere.
-
-To manually add more compute machines to your cluster, see xref:../../machine_management/user_infra/adding-vsphere-compute-user-infra.adoc#adding-vsphere-compute-user-infra[Adding compute machines to vSphere manually].
-
-
-[id="upi-adding-compute-bare-metal"]
-== Adding compute machines to bare metal
-
-To add more compute machines to your {product-title} cluster on bare metal, see xref:../../machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc#adding-bare-metal-compute-user-infra[Adding compute machines to bare metal].
diff --git a/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc b/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
index c1a95b319881..c47ed90a016e 100644
--- a/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
+++ b/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
@@ -54,7 +54,7 @@ In {product-title} {product-version}, you use the OpenShift installation program
 For more information, see xref:../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process].
 
 ifndef::openshift-origin[]
-If you want to add {op-system-base-full} worker machines to your {product-title} {product-version} cluster, you use an Ansible playbook to join the {op-system-base} worker machines after the cluster is running. For more information, see xref:../machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding {op-system-base} compute machines to an {product-title} cluster].
+If you want to add {op-system-base-full} worker machines to your {product-title} {product-version} cluster, you use an Ansible playbook to join the {op-system-base} worker machines after the cluster is running. For more information, see xref:../machine_management/manual_machine_management/adding-rhel-compute.adoc#adding-rhel-compute[Adding {op-system-base} compute machines to an {product-title} cluster].
 endif::[]
 
 [discrete]
diff --git a/modules/binding-infra-node-workloads-using-taints-tolerations.adoc b/modules/binding-infra-node-workloads-using-taints-tolerations.adoc
index e2e873e90e04..046df12d6b60 100644
--- a/modules/binding-infra-node-workloads-using-taints-tolerations.adoc
+++ b/modules/binding-infra-node-workloads-using-taints-tolerations.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * post_installation_configuration/cluster-tasks.adoc
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/cluster-autoscaler-about.adoc b/modules/cluster-autoscaler-about.adoc
index 4785ff3b12db..6bbfdaf0a3bd 100644
--- a/modules/cluster-autoscaler-about.adoc
+++ b/modules/cluster-autoscaler-about.adoc
@@ -2,7 +2,7 @@
 //
 // * nodes/nodes-about-autoscaling-nodes.adoc
 // * post_installation_configuration/cluster-tasks.adoc
-// * machine_management/applying-autoscaling.adoc
+// * machine_management/compute_machine_management/applying-autoscaling.adoc
 // * osd_cluster_admin/osd_nodes/osd-nodes-about-autoscaling-nodes.adoc
 // * osd_cluster_admin/osd-cluster-autoscaling.adoc
 // * rosa_cluster_admin/rosa-cluster-autoscaling.adoc
diff --git a/modules/cluster-autoscaler-config-priority-expander.adoc b/modules/cluster-autoscaler-config-priority-expander.adoc
index 6dd3b8c9809a..68e5c538fd75 100644
--- a/modules/cluster-autoscaler-config-priority-expander.adoc
+++ b/modules/cluster-autoscaler-config-priority-expander.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/applying-autoscaling.adoc
+// * machine_management/compute_machine_management/applying-autoscaling.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="cluster-autoscaler-config-priority-expander_{context}"]
diff --git a/modules/cluster-autoscaler-cr.adoc b/modules/cluster-autoscaler-cr.adoc
index c0722b841087..08c517f0eae1 100644
--- a/modules/cluster-autoscaler-cr.adoc
+++ b/modules/cluster-autoscaler-cr.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/applying-autoscaling.adoc
+// * machine_management/compute_machine_management/applying-autoscaling.adoc
 // * post_installation_configuration/cluster-tasks.adoc
 
 :_mod-docs-content-type: REFERENCE
diff --git a/modules/creating-an-infra-node.adoc b/modules/creating-an-infra-node.adoc
index 26f598b6a4f6..ac690dda1f39 100644
--- a/modules/creating-an-infra-node.adoc
+++ b/modules/creating-an-infra-node.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
 // * post_installation_configuration/cluster-tasks.adoc
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * nodes/nodes/nodes-nodes-creating-infrastructure-nodes.adoc
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/creating-infra-machines.adoc b/modules/creating-infra-machines.adoc
index 52ad16ada07b..b859450e229d 100644
--- a/modules/creating-infra-machines.adoc
+++ b/modules/creating-infra-machines.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * post_installation_configuration/cluster-tasks.adoc
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/csr-management.adoc b/modules/csr-management.adoc
index 6efb3093c67f..23239bcfdd93 100644
--- a/modules/csr-management.adoc
+++ b/modules/csr-management.adoc
@@ -19,8 +19,8 @@
 // installing/installing_ibm_z/installing-ibm-z-lpar.adoc
 // installing/installing_ibm_z/installing-restricted-networks-ibm-z-lpar.adoc
 // installing/installing_platform_agnostic/installing-platform-agnostic.adoc
-// machine_management/adding-rhel-compute.adoc
-// machine_management/more-rhel-compute.adoc
+// machine_management/manual_machine_management/adding-rhel-compute.adoc
+// machine_management/manual_machine_management/more-rhel-compute.adoc
 // post_installation_configuration/node-tasks.adoc
 // installing/installing_azure/installing-restricted-networks-azure-user-provisioned.adoc
 // installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc
diff --git a/modules/deleting-cluster-autoscaler.adoc b/modules/deleting-cluster-autoscaler.adoc
index 492ed72d0aba..3188d9ab75ae 100644
--- a/modules/deleting-cluster-autoscaler.adoc
+++ b/modules/deleting-cluster-autoscaler.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/applying-autoscaling.adoc
+// * machine_management/compute_machine_management/applying-autoscaling.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="deleting-cluster-autoscaler_{context}"]
diff --git a/modules/deleting-machine-autoscaler.adoc b/modules/deleting-machine-autoscaler.adoc
index f1f38d4dae08..f5b3ff1a16da 100644
--- a/modules/deleting-machine-autoscaler.adoc
+++ b/modules/deleting-machine-autoscaler.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/applying-autoscaling.adoc
+// * machine_management/compute_machine_management/applying-autoscaling.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="deleting-machine-autoscaler_{context}"]
diff --git a/modules/deploying-resource.adoc b/modules/deploying-resource.adoc
index 435fd526dbd6..0e3446a4427e 100644
--- a/modules/deploying-resource.adoc
+++ b/modules/deploying-resource.adoc
@@ -5,7 +5,7 @@
 //
 // Module included in the following assemblies:
 //
-// * machine_management/applying-autoscaling.adoc
+// * machine_management/compute_machine_management/applying-autoscaling.adoc
 // * post_installation_configuration/cluster-tasks.adoc
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/infrastructure-components.adoc b/modules/infrastructure-components.adoc
index a02791fa932a..c1878539d2b3 100644
--- a/modules/infrastructure-components.adoc
+++ b/modules/infrastructure-components.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * nodes-nodes-creating-infrastructure-nodes.adoc
 
 [id="infrastructure-components_{context}"]
diff --git a/modules/infrastructure-moving-monitoring.adoc b/modules/infrastructure-moving-monitoring.adoc
index 54de79f05d60..f3f5b2d23f8b 100644
--- a/modules/infrastructure-moving-monitoring.adoc
+++ b/modules/infrastructure-moving-monitoring.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="infrastructure-moving-monitoring_{context}"]
diff --git a/modules/infrastructure-moving-registry.adoc b/modules/infrastructure-moving-registry.adoc
index f23ccca14362..cab3209ff1ce 100644
--- a/modules/infrastructure-moving-registry.adoc
+++ b/modules/infrastructure-moving-registry.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="infrastructure-moving-registry_{context}"]
diff --git a/modules/infrastructure-moving-router.adoc b/modules/infrastructure-moving-router.adoc
index 84b05415547b..823810a9e7ed 100644
--- a/modules/infrastructure-moving-router.adoc
+++ b/modules/infrastructure-moving-router.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="infrastructure-moving-router_{context}"]
diff --git a/modules/installation-approve-csrs.adoc b/modules/installation-approve-csrs.adoc
index f98f6963ec4e..8bd9c04a340d 100644
--- a/modules/installation-approve-csrs.adoc
+++ b/modules/installation-approve-csrs.adoc
@@ -11,8 +11,8 @@
 // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
 // * installing/installing_vsphere/installing-vsphere.adoc
 // * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
-// * machine_management/adding-rhel-compute.adoc
-// * machine_management/more-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/more-rhel-compute.adoc
 // * machine_management/user_provisioned/adding-aws-compute-user-infra.adoc
 // * machine_management/user_provisioned/adding-bare-metal-compute-user-infra.adoc
 // * machine_management/user_provisioned/adding-vsphere-compute-user-infra.adoc
diff --git a/modules/machine-adding-aws-compute-cloudformation.adoc b/modules/machine-adding-aws-compute-cloudformation.adoc
index 5e38cd4d3ed1..cb66fa44ce3f 100644
--- a/modules/machine-adding-aws-compute-cloudformation.adoc
+++ b/modules/machine-adding-aws-compute-cloudformation.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/user_infra/adding-aws-compute-user-infra.adoc
+// * machine_management/manual_machine_management/user_infra/adding-aws-compute-user-infra.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="machine-adding-aws-compute-cloudformation_{context}"]
diff --git a/modules/machine-autoscaler-about.adoc b/modules/machine-autoscaler-about.adoc
index 61ed8808a0e8..54d50f84a55e 100644
--- a/modules/machine-autoscaler-about.adoc
+++ b/modules/machine-autoscaler-about.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/applying-autoscaling.adoc
+// * machine_management/compute_machine_management/applying-autoscaling.adoc
 // * post_installation_configuration/cluster-tasks.adoc
 
 :_mod-docs-content-type: CONCEPT
diff --git a/modules/machine-autoscaler-cr.adoc b/modules/machine-autoscaler-cr.adoc
index e33afbd0dd32..be64bcd8e473 100644
--- a/modules/machine-autoscaler-cr.adoc
+++ b/modules/machine-autoscaler-cr.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/applying-autoscaling.adoc
+// * machine_management/compute_machine_management/applying-autoscaling.adoc
 // * post_installation_configuration/cluster-tasks.adoc
 
 :_mod-docs-content-type: REFERENCE
diff --git a/modules/machine-delete.adoc b/modules/machine-delete.adoc
index 67399cb2d212..f01b102d7041 100644
--- a/modules/machine-delete.adoc
+++ b/modules/machine-delete.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/deleting-machine.adoc
+// * machine_management/manual_machine_management/deleting-machine.adoc
 // * windows_containers/removing-windows-nodes.adoc
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/machine-lifecycle-hook-deletion-etcd.adoc b/modules/machine-lifecycle-hook-deletion-etcd.adoc
index 218ce5cdd08b..8dc5700d6dcf 100644
--- a/modules/machine-lifecycle-hook-deletion-etcd.adoc
+++ b/modules/machine-lifecycle-hook-deletion-etcd.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/deleting-machine.adoc
+// * machine_management/manual_machine_management/deleting-machine.adoc
 
 :_mod-docs-content-type: CONCEPT
 [id="machine-lifecycle-hook-deletion-etcd_{context}"]
diff --git a/modules/machine-lifecycle-hook-deletion-format.adoc b/modules/machine-lifecycle-hook-deletion-format.adoc
index e5a40cac70a7..984ececafcfa 100644
--- a/modules/machine-lifecycle-hook-deletion-format.adoc
+++ b/modules/machine-lifecycle-hook-deletion-format.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/deleting-machine.adoc
+// * machine_management/manual_machine_management/deleting-machine.adoc
 
 :_mod-docs-content-type: REFERENCE
 [id="machine-lifecycle-hook-deletion-format_{context}"]
diff --git a/modules/machine-lifecycle-hook-deletion-uses.adoc b/modules/machine-lifecycle-hook-deletion-uses.adoc
index 8fa8910d02ef..593f2971658b 100644
--- a/modules/machine-lifecycle-hook-deletion-uses.adoc
+++ b/modules/machine-lifecycle-hook-deletion-uses.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/deleting-machine.adoc
+// * machine_management/manual_machine_management/deleting-machine.adoc
 
 :_mod-docs-content-type: CONCEPT
 [id="machine-lifecycle-hook-deletion-uses_{context}"]
diff --git a/modules/machine-lifecycle-hook-deletion.adoc b/modules/machine-lifecycle-hook-deletion.adoc
index 4b8588e303d6..bcbbe94480b7 100644
--- a/modules/machine-lifecycle-hook-deletion.adoc
+++ b/modules/machine-lifecycle-hook-deletion.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/deleting-machine.adoc
+// * machine_management/manual_machine_management/deleting-machine.adoc
 // Others TBD.
 
 //Placement considerations: Is this general info? Does it go with deletion docs? CPMS docs? etcd docs? Possibly some combo of those, or perhaps etcd as an example of a use case?
diff --git a/modules/machine-user-infra-machines-iso.adoc b/modules/machine-user-infra-machines-iso.adoc
index 52bc3f67bbe3..4eb7d72fa2a5 100644
--- a/modules/machine-user-infra-machines-iso.adoc
+++ b/modules/machine-user-infra-machines-iso.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc
+// * machine_management/manual_machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc
 // * post_installation_configuration/node-tasks.adoc
 // * post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-power.adoc
 
diff --git a/modules/machine-user-infra-machines-pxe.adoc b/modules/machine-user-infra-machines-pxe.adoc
index bc6e4cf78624..1a979cf2faef 100644
--- a/modules/machine-user-infra-machines-pxe.adoc
+++ b/modules/machine-user-infra-machines-pxe.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc
+// * machine_management/manual_machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc
 // * post_installation_configuration/node-tasks.adoc
 // * post_installation_configuration/multi-architecture-configuration.adoc
 // * post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-power.adoc
diff --git a/modules/machine-user-provisioned-limitations.adoc b/modules/machine-user-provisioned-limitations.adoc
index 16f9c3fa13ad..323732cddfad 100644
--- a/modules/machine-user-provisioned-limitations.adoc
+++ b/modules/machine-user-provisioned-limitations.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating_machinesets/creating-machineset-aws.adoc
 // * machine_management/creating_machinesets/creating-machineset-azure.adoc
 // * machine_management/creating_machinesets/creating-machineset-azure-stack-hub.adoc
diff --git a/modules/machine-vsphere-machines.adoc b/modules/machine-vsphere-machines.adoc
index 7aa75bf6f44e..4f54c9378d07 100644
--- a/modules/machine-vsphere-machines.adoc
+++ b/modules/machine-vsphere-machines.adoc
@@ -3,7 +3,7 @@
 // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
 // * installing/installing_vsphere/installing-vsphere.adoc
 // * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
-// * machine_management/user_infra/adding-vsphere-compute-user-infra.adoc
+// * machine_management/manual_machine_management/user_infra/adding-vsphere-compute-user-infra.adoc
 
 ifeval::["{context}" == "installing-vsphere"]
 :three-node-cluster:
diff --git a/modules/machineset-creating.adoc b/modules/machineset-creating.adoc
index dbc611661992..4039a1742526 100644
--- a/modules/machineset-creating.adoc
+++ b/modules/machineset-creating.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating_machinesets/creating-machineset-aws.adoc
 // * machine_management/creating_machinesets/creating-machineset-azure.adoc
 // * machine_management/creating_machinesets/creating-machineset-azure-stack-hub.adoc
diff --git a/modules/machineset-delete-policy.adoc b/modules/machineset-delete-policy.adoc
index 5c63252cb821..15a162bd6917 100644
--- a/modules/machineset-delete-policy.adoc
+++ b/modules/machineset-delete-policy.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/manually-scaling-machineset.adoc
+// * machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc
 // * post_installation_configuration/cluster-tasks.adoc
 
 [id="machineset-delete-policy_{context}"]
diff --git a/modules/machineset-manually-scaling.adoc b/modules/machineset-manually-scaling.adoc
index be42c53b0cd4..336a88f9b2f2 100644
--- a/modules/machineset-manually-scaling.adoc
+++ b/modules/machineset-manually-scaling.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/manually-scaling-machineset.adoc
+// * machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc
 // * post_installation_configuration/cluster-tasks.adoc
 // * windows_containers/scheduling-windows-workloads.adoc
 
diff --git a/modules/machineset-modifying.adoc b/modules/machineset-modifying.adoc
index 97ac6cb61e9e..65d4b7691cb0 100644
--- a/modules/machineset-modifying.adoc
+++ b/modules/machineset-modifying.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
 //
-// * machine_management/modifying-machineset.adoc
+// * machine_management/compute_machine_management/mapi_compute_managing_machines/modifying-machineset.adoc
 // * machine_management/cluster_api_machine_management/cluster-api-managing-machines.adoc
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/machineset-yaml-aws.adoc b/modules/machineset-yaml-aws.adoc
index dbc6bb72380f..2276c8cf38f6 100644
--- a/modules/machineset-yaml-aws.adoc
+++ b/modules/machineset-yaml-aws.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating_machinesets/creating-machineset-aws.adoc
 // * installing/installing_aws/aws-compute-edge-zone-tasks.adoc
 
diff --git a/modules/machineset-yaml-azure-stack-hub.adoc b/modules/machineset-yaml-azure-stack-hub.adoc
index 06372efe6cd1..6d649c3b3e08 100644
--- a/modules/machineset-yaml-azure-stack-hub.adoc
+++ b/modules/machineset-yaml-azure-stack-hub.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating_machinesets/creating-machineset-azure-stack-hub.adoc
 
 ifeval::["{context}" == "creating-infrastructure-machinesets"]
diff --git a/modules/machineset-yaml-azure.adoc b/modules/machineset-yaml-azure.adoc
index 19c259787a82..6b47ac408cb1 100644
--- a/modules/machineset-yaml-azure.adoc
+++ b/modules/machineset-yaml-azure.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating-machineset-azure.adoc
 
 ifeval::["{context}" == "creating-infrastructure-machinesets"]
diff --git a/modules/machineset-yaml-baremetal.adoc b/modules/machineset-yaml-baremetal.adoc
index b86f342302f4..b4ad07acd6b2 100644
--- a/modules/machineset-yaml-baremetal.adoc
+++ b/modules/machineset-yaml-baremetal.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating_machinesets/creating-machineset-bare-metal.adoc
 
 ifeval::["{context}" == "creating-infrastructure-machinesets"]
diff --git a/modules/machineset-yaml-gcp.adoc b/modules/machineset-yaml-gcp.adoc
index 1ed231920038..1eee6896e85c 100644
--- a/modules/machineset-yaml-gcp.adoc
+++ b/modules/machineset-yaml-gcp.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating-machineset-gcp.adoc
 
 ifeval::["{context}" == "creating-infrastructure-machinesets"]
diff --git a/modules/machineset-yaml-ibm-cloud.adoc b/modules/machineset-yaml-ibm-cloud.adoc
index b47709208ad0..079970c61e4d 100644
--- a/modules/machineset-yaml-ibm-cloud.adoc
+++ b/modules/machineset-yaml-ibm-cloud.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating_machinesets/creating-machineset-ibm-cloud.adoc
 
 ifeval::["{context}" == "creating-infrastructure-machinesets"]
diff --git a/modules/machineset-yaml-nutanix.adoc b/modules/machineset-yaml-nutanix.adoc
index 0ec2248ad5a9..cb5dd94e06da 100644
--- a/modules/machineset-yaml-nutanix.adoc
+++ b/modules/machineset-yaml-nutanix.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating_machinesets/creating-machineset-nutanix.adoc
 
 ifeval::["{context}" == "creating-infrastructure-machinesets"]
diff --git a/modules/machineset-yaml-osp.adoc b/modules/machineset-yaml-osp.adoc
index dc1055c4a847..c97c93be17db 100644
--- a/modules/machineset-yaml-osp.adoc
+++ b/modules/machineset-yaml-osp.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating_machinesets/creating-machineset-osp.adoc
 
 ifeval::["{context}" == "creating-infrastructure-machinesets"]
diff --git a/modules/machineset-yaml-vsphere.adoc b/modules/machineset-yaml-vsphere.adoc
index c86225ff599a..50d054e3905a 100644
--- a/modules/machineset-yaml-vsphere.adoc
+++ b/modules/machineset-yaml-vsphere.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * machine_management/creating_machinesets/creating-machineset-vsphere.adoc
 
 ifeval::["{context}" == "creating-infrastructure-machinesets"]
diff --git a/modules/nodes-cluster-resource-override-move-infra.adoc b/modules/nodes-cluster-resource-override-move-infra.adoc
index 35c875a67814..6be0ae704c10 100644
--- a/modules/nodes-cluster-resource-override-move-infra.adoc
+++ b/modules/nodes-cluster-resource-override-move-infra.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
 // * nodes/clusters/nodes-cluster-overcommit.adoc
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 
 ifeval::["{context}" == "nodes-cluster-overcommit"]
 :cro:
diff --git a/modules/nodes-pods-vertical-autoscaler-moving-vpa.adoc b/modules/nodes-pods-vertical-autoscaler-moving-vpa.adoc
index 08cf3a7ab509..5f1696de1f1e 100644
--- a/modules/nodes-pods-vertical-autoscaler-moving-vpa.adoc
+++ b/modules/nodes-pods-vertical-autoscaler-moving-vpa.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/creating-infrastructure-machinesets.adoc
+// * machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc
 // * nodes/pods/nodes-pods-vertical-autoscaler
 
 ifeval::["{context}" == "nodes-pods-vertical-autoscaler"]
diff --git a/modules/rhel-adding-more-nodes.adoc b/modules/rhel-adding-more-nodes.adoc
index b0850ae47a19..9250761aacf0 100644
--- a/modules/rhel-adding-more-nodes.adoc
+++ b/modules/rhel-adding-more-nodes.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/more-rhel-compute.adoc
+// * machine_management/manual_machine_management/more-rhel-compute.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="rhel-adding-more-nodes_{context}"]
diff --git a/modules/rhel-adding-node.adoc b/modules/rhel-adding-node.adoc
index 6a5c6fcdc33c..722025553903 100644
--- a/modules/rhel-adding-node.adoc
+++ b/modules/rhel-adding-node.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
 // * post_installation_configuration/node-tasks.adoc
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/rhel-ansible-parameters.adoc b/modules/rhel-ansible-parameters.adoc
index 802ca2aa6c38..fc5eab45dbde 100644
--- a/modules/rhel-ansible-parameters.adoc
+++ b/modules/rhel-ansible-parameters.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * machine_management/adding-rhel-compute.adoc
-// * machine_management/more-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/more-rhel-compute.adoc
 // * post_installation_configuration/node-tasks.adoc
 
 [id="rhel-ansible-parameters_{context}"]
diff --git a/modules/rhel-attaching-instance-aws.adoc b/modules/rhel-attaching-instance-aws.adoc
index 24f2394123d1..23cde525ae46 100644
--- a/modules/rhel-attaching-instance-aws.adoc
+++ b/modules/rhel-attaching-instance-aws.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * machine_management/adding-rhel-compute.adoc
-// * machine_management/more-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/more-rhel-compute.adoc
 
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/rhel-compute-overview.adoc b/modules/rhel-compute-overview.adoc
index 29683d11d5b2..180234c5f1e0 100644
--- a/modules/rhel-compute-overview.adoc
+++ b/modules/rhel-compute-overview.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * machine_management/adding-rhel-compute.adoc
-// * machine_management/more-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/more-rhel-compute.adoc
 // * post_installation_configuration/node-tasks.adoc
 
 :_mod-docs-content-type: CONCEPT
diff --git a/modules/rhel-compute-requirements.adoc b/modules/rhel-compute-requirements.adoc
index 4e656996a9c4..938892b4dace 100644
--- a/modules/rhel-compute-requirements.adoc
+++ b/modules/rhel-compute-requirements.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * machine_management/adding-rhel-compute.adoc
-// * machine_management/more-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/more-rhel-compute.adoc
 // * post_installation_configuration/node-tasks.adoc
 
 
diff --git a/modules/rhel-images-aws.adoc b/modules/rhel-images-aws.adoc
index 24e0609a0444..9a2ef463692c 100644
--- a/modules/rhel-images-aws.adoc
+++ b/modules/rhel-images-aws.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * machine_management/adding-rhel-compute.adoc
-// * machine_management/more-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/more-rhel-compute.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="rhel-images-aws_{context}"]
diff --git a/modules/rhel-preparing-node.adoc b/modules/rhel-preparing-node.adoc
index c1fd07e0fb48..f714eaf4e27f 100644
--- a/modules/rhel-preparing-node.adoc
+++ b/modules/rhel-preparing-node.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * machine_management/adding-rhel-compute.adoc
-// * machine_management/more-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/more-rhel-compute.adoc
 // * post_installation_configuration/node-tasks.adoc
 
 [id="rhel-preparing-node_{context}"]
diff --git a/modules/rhel-preparing-playbook-machine.adoc b/modules/rhel-preparing-playbook-machine.adoc
index f59cba01eca5..fffb30a104e4 100644
--- a/modules/rhel-preparing-playbook-machine.adoc
+++ b/modules/rhel-preparing-playbook-machine.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
 // * post_installation_configuration/node-tasks.adoc
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/rhel-removing-rhcos.adoc b/modules/rhel-removing-rhcos.adoc
index 9bb42cbe6a94..05cac782bbd6 100644
--- a/modules/rhel-removing-rhcos.adoc
+++ b/modules/rhel-removing-rhcos.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
 // * post_installation_configuration/node-tasks.adoc
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/rhel-worker-tag.adoc b/modules/rhel-worker-tag.adoc
index 150312cf0c63..4f0d1bb005b6 100644
--- a/modules/rhel-worker-tag.adoc
+++ b/modules/rhel-worker-tag.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * machine_management/adding-rhel-compute.adoc
-// * machine_management/more-rhel-compute.adoc
+// * machine_management/manual_machine_management/adding-rhel-compute.adoc
+// * machine_management/manual_machine_management/more-rhel-compute.adoc
 
 
 :_mod-docs-content-type: PROCEDURE
diff --git a/modules/updating-control-plane-only-update-console.adoc b/modules/updating-control-plane-only-update-console.adoc
index b38a23e8d575..df45aff8d3d4 100644
--- a/modules/updating-control-plane-only-update-console.adoc
+++ b/modules/updating-control-plane-only-update-console.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * updating/updating_a_cluster/control-plane-only-update.adoc.adoc
+// * updating/updating_a_cluster/control-plane-only-update.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="updating-control-plane-only-update-console_{context}"]
diff --git a/nodes/clusters/nodes-cluster-overcommit.adoc b/nodes/clusters/nodes-cluster-overcommit.adoc
index 9cae3b56003a..7947d4597282 100644
--- a/nodes/clusters/nodes-cluster-overcommit.adoc
+++ b/nodes/clusters/nodes-cluster-overcommit.adoc
@@ -54,28 +54,28 @@ include::modules/nodes-cluster-resource-override-deploy-console.adoc[leveloffset
 
 ifndef::openshift-rosa,openshift-dedicated[]
 .Additional resources
-* xref:../../machine_management/creating-infrastructure-machinesets.adoc#nodes-cluster-resource-override-move-infra_creating-infrastructure-machinesets[Moving the Cluster Resource Override Operator pods]
+* xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#nodes-cluster-resource-override-move-infra_creating-infrastructure-machinesets[Moving the Cluster Resource Override Operator pods]
 endif::openshift-rosa,openshift-dedicated[]
 
 include::modules/nodes-cluster-resource-override-deploy-cli.adoc[leveloffset=+2]
 
 ifndef::openshift-rosa,openshift-dedicated[]
 .Additional resources
-* xref:../../machine_management/creating-infrastructure-machinesets.adoc#nodes-cluster-resource-override-move-infra_creating-infrastructure-machinesets[Moving the Cluster Resource Override Operator pods]
+* xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#nodes-cluster-resource-override-move-infra_creating-infrastructure-machinesets[Moving the Cluster Resource Override Operator pods]
 endif::openshift-rosa,openshift-dedicated[]
 
 include::modules/nodes-cluster-resource-configure.adoc[leveloffset=+2]
 
 ifndef::openshift-rosa,openshift-dedicated[]
 .Additional resources
-* xref:../../machine_management/creating-infrastructure-machinesets.adoc#nodes-cluster-resource-override-move-infra_creating-infrastructure-machinesets[Moving the Cluster Resource Override Operator pods]
+* xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#nodes-cluster-resource-override-move-infra_creating-infrastructure-machinesets[Moving the Cluster Resource Override Operator pods]
 endif::openshift-rosa,openshift-dedicated[]
 
 ifndef::openshift-rosa,openshift-dedicated[]
 include::modules/nodes-cluster-resource-override-move-infra.adoc[leveloffset=+2]
 
 .Additional resources
-* xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets]
+* xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets]
 endif::openshift-rosa,openshift-dedicated[]
 
 include::modules/nodes-cluster-node-overcommit.adoc[leveloffset=+1]
diff --git a/nodes/nodes/nodes-nodes-creating-infrastructure-nodes.adoc b/nodes/nodes/nodes-nodes-creating-infrastructure-nodes.adoc
index 08c8b5996b64..ba6db6334286 100644
--- a/nodes/nodes/nodes-nodes-creating-infrastructure-nodes.adoc
+++ b/nodes/nodes/nodes-nodes-creating-infrastructure-nodes.adoc
@@ -22,12 +22,12 @@ include::modules/infrastructure-components.adoc[leveloffset=+1]
 
 For information about infrastructure nodes and which components can run on infrastructure nodes, see the "Red Hat OpenShift control plane and infrastructure nodes" section in the link:https://www.redhat.com/en/resources/openshift-subscription-sizing-guide[OpenShift sizing and subscription guide for enterprise Kubernetes] document.
 
-To create an infrastructure node, you can xref:../../machine_management/creating-infrastructure-machinesets.adoc#machineset-creating_creating-infrastructure-machinesets[use a machine set], xref:../../nodes/nodes/nodes-nodes-creating-infrastructure-nodes.adoc#creating-an-infra-node_creating-infrastructure-nodes[label the node], or xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infra-machines_creating-infrastructure-machinesets[use a machine config pool].
+To create an infrastructure node, you can xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#machineset-creating_creating-infrastructure-machinesets[use a machine set], xref:../../nodes/nodes/nodes-nodes-creating-infrastructure-nodes.adoc#creating-an-infra-node_creating-infrastructure-nodes[label the node], or xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infra-machines_creating-infrastructure-machinesets[use a machine config pool].
 
 include::modules/creating-an-infra-node.adoc[leveloffset=+2]
 
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../machine_management/creating-infrastructure-machinesets.adoc#moving-resources-to-infrastructure-machinesets[Moving resources to infrastructure machine sets]
+* xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#moving-resources-to-infrastructure-machinesets[Moving resources to infrastructure machine sets]
 
diff --git a/nodes/nodes/nodes-nodes-working.adoc b/nodes/nodes/nodes-nodes-working.adoc
index cf5aa6c8fdf6..564aa68579a3 100644
--- a/nodes/nodes/nodes-nodes-working.adoc
+++ b/nodes/nodes/nodes-nodes-working.adoc
@@ -43,7 +43,7 @@ include::modules/nodes-nodes-working-deleting.adoc[leveloffset=+2]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../machine_management/manually-scaling-machineset.adoc#machineset-manually-scaling-manually-scaling-machineset[Manually scaling a compute machine set]
+* xref:../../machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc#machineset-manually-scaling-manually-scaling-machineset[Manually scaling a compute machine set]
 
 include::modules/nodes-nodes-working-deleting-bare-metal.adoc[leveloffset=+2]
 endif::openshift-rosa[]
diff --git a/nodes/pods/nodes-pods-vertical-autoscaler.adoc b/nodes/pods/nodes-pods-vertical-autoscaler.adoc
index 6a6f1b5b9264..7fedc08484c8 100644
--- a/nodes/pods/nodes-pods-vertical-autoscaler.adoc
+++ b/nodes/pods/nodes-pods-vertical-autoscaler.adoc
@@ -26,7 +26,7 @@ include::modules/nodes-pods-vertical-autoscaler-moving-vpa.adoc[leveloffset=+1]
 
 .Additional resources
 
-* xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets-production[Creating infrastructure machine sets] 
+* xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets-production[Creating infrastructure machine sets] 
 
 include::modules/nodes-pods-vertical-autoscaler-using-about.adoc[leveloffset=+1]
 
diff --git a/operators/index.adoc b/operators/index.adoc
index 082e98c777d6..423a10b459e2 100644
--- a/operators/index.adoc
+++ b/operators/index.adoc
@@ -32,7 +32,7 @@ endif::openshift-dedicated,openshift-rosa[]
 ifndef::openshift-dedicated,openshift-rosa[]
 [role="_additional-resources"]
 .Additional resources
-* xref:../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion-uses_deleting-machine[Machine deletion lifecycle hook examples for Operator developers]
+* xref:../machine_management/manual_machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion-uses_deleting-machine[Machine deletion lifecycle hook examples for Operator developers]
 endif::openshift-dedicated,openshift-rosa[]
 
 [id="operators-overview-administrator-tasks_{context}"]
diff --git a/post_installation_configuration/cluster-tasks.adoc b/post_installation_configuration/cluster-tasks.adoc
index 10efb4227868..996385b931d8 100644
--- a/post_installation_configuration/cluster-tasks.adoc
+++ b/post_installation_configuration/cluster-tasks.adoc
@@ -247,11 +247,11 @@ You can create a compute machine set to create machines that host only infrastru
 
 In a production deployment, it is recommended that you deploy at least three compute machine sets to hold infrastructure components. Both OpenShift Logging and {SMProductName} deploy Elasticsearch, which requires three instances to be installed on different nodes. Each of these nodes can be deployed to different availability zones for high availability. A configuration like this requires three different compute machine sets, one for each availability zone. In global Azure regions that do not have multiple availability zones, you can use availability sets to ensure high availability.
 
-For information on infrastructure nodes and which components can run on infrastructure nodes, see xref:../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets].
+For information on infrastructure nodes and which components can run on infrastructure nodes, see xref:../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets].
 
 To create an infrastructure node, you can xref:../post_installation_configuration/cluster-tasks.adoc#machineset-creating_post-install-cluster-tasks[use a machine set], xref:../post_installation_configuration/cluster-tasks.adoc#creating-an-infra-node_post-install-cluster-tasks[assign a label to the nodes], or xref:../post_installation_configuration/cluster-tasks.adoc#creating-infra-machines_post-install-cluster-tasks[use a machine config pool].
 
-For sample machine sets that you can use with these procedures, see xref:../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets-clouds[Creating machine sets for different clouds].
+For sample machine sets that you can use with these procedures, see xref:../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets-clouds[Creating machine sets for different clouds].
 
 Applying a specific node selector to all infrastructure components causes {product-title} to xref:../post_installation_configuration/cluster-tasks.adoc#moving-resources-to-infrastructure-machinesets[schedule those workloads on nodes with that label].
 
diff --git a/post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-compute-managing.adoc b/post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-compute-managing.adoc
index 1b813312691c..2955d10dffbc 100644
--- a/post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-compute-managing.adoc
+++ b/post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-compute-managing.adoc
@@ -26,7 +26,7 @@ include::modules/multi-architecture-scheduling-examples.adoc[leveloffset=+2]
 
 .Additional resources
 
-* xref:../../machine_management/modifying-machineset.adoc#machineset-modifying_modifying-machineset[Modifying a compute machine set]
+* xref:../../machine_management/compute_machine_management/mapi_compute_managing_machines/modifying-machineset.adoc#machineset-modifying_modifying-machineset[Modifying a compute machine set]
 
 include::modules/multi-architecture-enabling-64k-pages.adoc[leveloffset=+1]
 
diff --git a/rosa_architecture/index.adoc b/rosa_architecture/index.adoc
index a86640a22ccd..541dbea26054 100644
--- a/rosa_architecture/index.adoc
+++ b/rosa_architecture/index.adoc
@@ -233,7 +233,7 @@ Manage machines, provide services to users, and follow monitoring and logging re
 
 === Manage cluster components
 
-- **Manage machines**: Manage xref:../machine_management/index.adoc#machine-mgmt-intro-managing-compute_overview-of-machine-management[compute] and xref:../machine_management/index.adoc#machine-mgmt-intro-managing-control-plane_overview-of-machine-management[control plane] machines in your cluster with machine sets, by xref:../machine_management/deploying-machine-health-checks.adoc#deploying-machine-health-checks[deploying health checks], and xref:../machine_management/applying-autoscaling.adoc#applying-autoscaling[applying autoscaling].
+- **Manage machines**: Manage xref:../machine_management/index.adoc#machine-mgmt-intro-managing-compute_overview-of-machine-management[compute] and xref:../machine_management/index.adoc#machine-mgmt-intro-managing-control-plane_overview-of-machine-management[control plane] machines in your cluster with machine sets, by xref:../machine_management/deploying-machine-health-checks.adoc#deploying-machine-health-checks[deploying health checks], and xref:../machine_management/compute_machine_management/applying-autoscaling.adoc#applying-autoscaling[applying autoscaling].
 
 - **xref:../registry/index.adoc#registry-overview[Manage container registries]**: Each {product-title} cluster includes a built-in container registry for storing its images. You can also configure a separate link:https://access.redhat.com/documentation/en-us/red_hat_quay/[Red Hat Quay] registry to use with {product-title}. The link:https://quay.io[Quay.io] website provides a public container registry that stores {product-title} containers and Operators.
 
diff --git a/scalability_and_performance/managing-bare-metal-hosts.adoc b/scalability_and_performance/managing-bare-metal-hosts.adoc
index 13319e353022..a4b6716dd8fa 100644
--- a/scalability_and_performance/managing-bare-metal-hosts.adoc
+++ b/scalability_and_performance/managing-bare-metal-hosts.adoc
@@ -14,7 +14,7 @@ include::modules/maintaining-bare-metal-hosts.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc#adding-bare-metal-compute-user-infra[Adding compute machines to bare metal]
+* xref:../machine_management/manual_machine_management/user_infra/adding-bare-metal-compute-user-infra.adoc#adding-bare-metal-compute-user-infra[Adding compute machines to bare metal]
 
 include::modules/adding-bare-metal-host-to-cluster-using-web-console.adoc[leveloffset=+2]
 include::modules/adding-bare-metal-host-to-cluster-using-yaml.adoc[leveloffset=+2]
diff --git a/scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc b/scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc
index cdd9438d4fb6..55f0e21b3215 100644
--- a/scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc
+++ b/scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc
@@ -24,4 +24,4 @@ include::modules/configuring-cluster-monitoring.adoc[leveloffset=+1]
 
 * link:https://access.redhat.com/solutions/5034771[Infrastructure Nodes in OpenShift 4]
 * xref:../../scalability_and_performance/planning-your-environment-according-to-object-maximums.adoc#planning-your-environment-according-to-object-maximums[{product-title} cluster maximums]
-* xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets]
+* xref:../../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets]
diff --git a/serverless/install/preparing-serverless-install.adoc b/serverless/install/preparing-serverless-install.adoc
index 4792bb23d2f2..85f4c3dad7f9 100644
--- a/serverless/install/preparing-serverless-install.adoc
+++ b/serverless/install/preparing-serverless-install.adoc
@@ -42,7 +42,7 @@ include::modules/serverless-cluster-sizing-req.adoc[leveloffset=+1]
 [id="install-serverless-operator-scaling-with-machinesets"]
 == Scaling your cluster using compute machine sets
 
-You can use the {product-title} `MachineSet` API to manually scale your cluster up to the desired size. The minimum requirements usually mean that you must scale up one of the default compute machine sets by two additional machines. See xref:../../machine_management/manually-scaling-machineset.adoc#manually-scaling-machineset[Manually scaling a compute machine set].
+You can use the {product-title} `MachineSet` API to manually scale your cluster up to the desired size. The minimum requirements usually mean that you must scale up one of the default compute machine sets by two additional machines. See xref:../../machine_management/compute_machine_management/mapi_compute_managing_machines/manually-scaling-machineset.adoc#manually-scaling-machineset[Manually scaling a compute machine set].
 
 include::modules/serverless-cluster-sizing-req-additional.adoc[leveloffset=+2]
 
diff --git a/welcome/learn_more_about_openshift.adoc b/welcome/learn_more_about_openshift.adoc
index 256d9d795a35..4a639662ebea 100644
--- a/welcome/learn_more_about_openshift.adoc
+++ b/welcome/learn_more_about_openshift.adoc
@@ -137,7 +137,7 @@ a|* xref:../machine_management/index.adoc#machine-api-overview_overview-of-machi
 |xref:../machine_management/deploying-machine-health-checks.adoc#deploying-machine-health-checks[Deploying machine health checks]
 |
 
-|xref:../machine_management/applying-autoscaling.adoc#applying-autoscaling[Applying autoscaling to an {product-title} cluster]
+|xref:../machine_management/compute_machine_management/applying-autoscaling.adoc#applying-autoscaling[Applying autoscaling to an {product-title} cluster]
 |
 
 | xref:../registry/index.adoc#registry-overview[Manage container registries]
@@ -300,7 +300,7 @@ a|* xref:../cicd/builds/understanding-image-builds.adoc#understanding-image-buil
 
 | link:https://docs.openshift.com/gitops/latest/declarative_clusterconfig/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.html[Configuring an OpenShift cluster by deploying an application with cluster configurations]
 a|* xref:../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
-* xref:../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets]
+* xref:../machine_management/creating_machinesets/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets]
 |===