diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml
index 4516e57b3e..ad85bb21ab 100644
--- a/_topic_maps/_topic_map_rosa.yml
+++ b/_topic_maps/_topic_map_rosa.yml
@@ -610,9 +610,6 @@ Topics:
     File: dedicated-aws-dc
 - Name: Cluster autoscaling
   File: rosa-cluster-autoscaling
-- Name: Cluster autoscaling for ROSA HCP
-  File: rosa-cluster-autoscaling-hcp
-  # Remove cluster autoscaling for ROSA HCP once the HCP docs are published
 - Name: Managing compute nodes using machine pools
   Dir: rosa_nodes
   Distros: openshift-rosa
diff --git a/_topic_maps/_topic_map_rosa_hcp.yml b/_topic_maps/_topic_map_rosa_hcp.yml
index 75b684685e..7569c09c45 100644
--- a/_topic_maps/_topic_map_rosa_hcp.yml
+++ b/_topic_maps/_topic_map_rosa_hcp.yml
@@ -466,7 +466,7 @@ Topics:
   - Name: Configuring AWS Direct Connect
     File: dedicated-aws-dc
 - Name: Cluster autoscaling
-  File: rosa-cluster-autoscaling
+  File: rosa-cluster-autoscaling-hcp
 - Name: Managing compute nodes using machine pools
   Dir: rosa_nodes
   Topics:
diff --git a/rosa_cluster_admin/rosa-cluster-autoscaling-hcp.adoc b/rosa_cluster_admin/rosa-cluster-autoscaling-hcp.adoc
index 57f2497299..4d36d054aa 100644
--- a/rosa_cluster_admin/rosa-cluster-autoscaling-hcp.adoc
+++ b/rosa_cluster_admin/rosa-cluster-autoscaling-hcp.adoc
@@ -75,46 +75,9 @@ Pods with priority lower than the cutoff value do not cause the cluster to scale
 ////
 Default priority cutoff is 0. It can be changed using `--expendable-pods-priority-cutoff` flag, but we discourage it. cluster autoscaler also doesn't trigger scale-up if an unschedulable Pod is already waiting for a lower priority Pod preemption.
 ////
+include::modules/rosa-cluster-autoscaler-cli-interactive-during.adoc[leveloffset=+1]
 
-//::modules/rosa-cluster-autoscaler-cli-edit.adoc[leveloffset=+1]
-[id="rosa-edit-cluster-autoscale-cli_{context}"]
-== Edit autoscaling after cluster creation with the ROSA CLI
-
-You can edit any specific parameters of the cluster autoscaler after creating the autoscaler.
-
-.Procedure
-
-. To edit the cluster autoscaler, run the following command:
-+
-.Example
-[source,terminal]
-----
-$ rosa edit autoscaler --cluster=<mycluster>
-----
-+
-.. To edit a specific parameter, run the following command:
-+
-.Example
-[source,terminal]
-----
-$ rosa edit autoscaler --cluster=<mycluster> <parameter>
-----
-
-//::modules/rosa-cluster-autoscaler-cli-describe.adoc[leveloffset=+1]
-[id="rosa-cluster-autoscaler-cli-describe_{context}"]
-== View autoscaler configurations with the ROSA CLI
-
-You can view your cluster autoscaler configurations using the `rosa describe autoscaler` command.
-
-.Procedure
-
-* To view cluster autoscaler configurations, run the following command:
-+
-.Example
-[source,terminal]
-----
-$ rosa describe autoscaler -h --cluster=<mycluster>
-----
+include::modules/rosa-cluster-autoscaler-cli-during.adoc[leveloffset=+1]
 
 //include::modules/rosa-cluster-autoscaler-cli-settings.adoc[leveloffset=+1]
 [id="rosa-cluster-cli-autoscale-parameters_{context}"]
@@ -157,3 +120,43 @@ You can add the following parameters to the cluster creation command to configur
 
 |===
 
+//::modules/rosa-cluster-autoscaler-cli-edit.adoc[leveloffset=+1]
+[id="rosa-edit-cluster-autoscale-cli_{context}"]
+== Edit autoscaling after cluster creation with the ROSA CLI
+
+You can edit any specific parameters of the cluster autoscaler after creating the autoscaler.
+
+.Procedure
+
+* To edit the cluster autoscaler, run the following command:
++
+.Example
+[source,terminal]
+----
+$ rosa edit autoscaler --cluster=<mycluster>
+----
++
+** To edit a specific parameter, run the following command:
++
+.Example
+[source,terminal]
+----
+$ rosa edit autoscaler --cluster=<mycluster> <parameter>
+----
+
+//::modules/rosa-cluster-autoscaler-cli-describe.adoc[leveloffset=+1]
+[id="rosa-cluster-autoscaler-cli-describe_{context}"]
+== View autoscaler configurations with the ROSA CLI
+
+You can view your cluster autoscaler configurations using the `rosa describe autoscaler` command.
+
+.Procedure
+
+* To view cluster autoscaler configurations, run the following command:
++
+.Example
+[source,terminal]
+----
+$ rosa describe autoscaler -h --cluster=<mycluster>
+----
+
diff --git a/rosa_cluster_admin/rosa-cluster-autoscaling.adoc b/rosa_cluster_admin/rosa-cluster-autoscaling.adoc
index 185756fadf..dbc3c79b76 100644
--- a/rosa_cluster_admin/rosa-cluster-autoscaling.adoc
+++ b/rosa_cluster_admin/rosa-cluster-autoscaling.adoc
@@ -42,6 +42,8 @@ include::modules/rosa-cluster-autoscaler-cli-interactive-after.adoc[leveloffset=
 
 include::modules/rosa-cluster-autoscaler-cli-during.adoc[leveloffset=+1]
 
+include::modules/rosa-cluster-autoscaler-cli-settings.adoc[leveloffset=+1]
+
 include::modules/rosa-cluster-autoscaler-cli-after.adoc[leveloffset=+1]
 endif::openshift-rosa[]
 
@@ -53,4 +55,4 @@ ifdef::openshift-rosa[]
 include::modules/rosa-cluster-autoscaler-cli-delete.adoc[leveloffset=+1]
 endif::openshift-rosa[]
 
-include::modules/rosa-cluster-autoscaler-cli-settings.adoc[leveloffset=+1]
+