openshift · mletalie · Sep 3, 2025 · Aug 25, 2025
diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml
@@ -109,45 +109,41 @@ Distros: openshift-rosa
 Topics:
 - Name: Tutorials overview
   File: index
-#- Name: ROSA prerequisites
+#- Name: ROSA classic architecture prerequisites
 #  File: rosa-mobb-prerequisites-tutorial
-- Name: ROSA with HCP activation and account linking
-  File: cloud-experts-rosa-hcp-activation-and-account-linking-tutorial
-- Name: ROSA with HCP private offer acceptance and sharing
-  File: cloud-experts-rosa-with-hcp-private-offer-acceptance-and-sharing
-- Name: Verifying Permissions for a ROSA STS Deployment
+- Name: Verifying Permissions for a ROSA classic architecture STS Deployment
   File: rosa-mobb-verify-permissions-sts-deployment
-- Name: Deploying ROSA with a Custom DNS Resolver
+- Name: Deploying ROSA classic architecture with a Custom DNS Resolver
   File: cloud-experts-custom-dns-resolver
-- Name: Using AWS WAF and Amazon CloudFront to protect ROSA workloads
+- Name: Using AWS WAF and Amazon CloudFront to protect ROSA classic architecture workloads
   File: cloud-experts-using-cloudfront-and-waf
-- Name: Using AWS WAF and AWS ALBs to protect ROSA workloads
+- Name: Using AWS WAF and AWS ALBs to protect ROSA classic architecture workloads
   File: cloud-experts-using-alb-and-waf
-- Name: Deploying OpenShift API for Data Protection on a ROSA cluster
+- Name: Deploying OpenShift API for Data Protection on a ROSA classic architecture cluster
   File: cloud-experts-deploy-api-data-protection
-- Name: AWS Load Balancer Operator on ROSA
+- Name: AWS Load Balancer Operator on ROSA classic architecture
   File: cloud-experts-aws-load-balancer-operator
 - Name: Configuring Microsoft Entra ID (formerly Azure Active Directory) as an identity provider
   File: cloud-experts-entra-id-idp
-- Name: Using AWS Secrets Manager CSI on ROSA with STS
+- Name: Using AWS Secrets Manager CSI on ROSA classic architecture with STS
   File: cloud-experts-aws-secret-manager
-- Name: Using AWS Controllers for Kubernetes on ROSA
+- Name: Using AWS Controllers for Kubernetes on ROSA classic architecture
   File: cloud-experts-using-aws-ack
-- Name: Deploying the External DNS Operator on ROSA
+- Name: Deploying the External DNS Operator on ROSA classic architecture
   File: cloud-experts-external-dns
 - Name: Dynamically issuing certificates using the cert-manager Operator on ROSA
   File: cloud-experts-dynamic-certificate-custom-domain
 - Name: Assigning consistent egress IP for external traffic
   File: cloud-experts-consistent-egress-ip
 - Name: Updating component routes with custom domains and TLS certificates
   File: cloud-experts-update-component-routes
-- Name: Getting started with ROSA
+- Name: Getting started with ROSA classic architecture
   Dir: cloud-experts-getting-started
   Distros: openshift-rosa
   Topics:
-  - Name: What is ROSA
+  - Name: What is ROSA classic architecture
     File: cloud-experts-getting-started-what-is-rosa
-  - Name: ROSA with AWS STS explained
+  - Name: ROSA classic architecture with AWS STS explained
     File: cloud-experts-rosa-sts-explained
   - Name: OpenShift concepts
     File: cloud-experts-getting-started-openshift-concepts
@@ -164,8 +160,6 @@ Topics:
       File: cloud-experts-getting-started-simple-ui-guide
     - Name: Detailed UI guide
       File: cloud-experts-getting-started-detailed-ui
-    - Name: HCP deployment guide
-      File: cloud-experts-getting-started-hcp
   - Name: Creating an admin user
     File: cloud-experts-getting-started-admin
   - Name: Setting up an identity provider

diff --git a/_topic_maps/_topic_map_rosa_hcp.yml b/_topic_maps/_topic_map_rosa_hcp.yml
@@ -36,9 +36,9 @@ Topics:
   File: index
 - Name: Legal notice
   File: legal-notice
-- Name: ROSA with HCP overview
+- Name: ROSA overview
   File: about-hcp
-- Name: AWS STS and ROSA with HCP explained
+- Name: AWS STS and ROSA explained
   File: cloud-experts-rosa-hcp-sts-explained
 - Name: Architecture models
   File: rosa-architecture-models
@@ -50,11 +50,11 @@ Topics:
     File: rosa-policy-understand-availability
   - Name: Overview of responsibilities for ROSA
     File: rosa-policy-responsibility-matrix
-  - Name: ROSA with HCP service definition
+  - Name: ROSA service definition
     File: rosa-hcp-service-definition
-  - Name: ROSA with HCP instance types
+  - Name: ROSA instance types
     File: rosa-hcp-instance-types
-  - Name: ROSA with HCP update life cycle
+  - Name: ROSA update life cycle
     File: rosa-hcp-life-cycle
   - Name: SRE and service account access
     File: rosa-sre-access
@@ -121,9 +121,9 @@ Distros: openshift-rosa-hcp
 Topics:
 - Name: Tutorials overview
   File: index
-- Name: ROSA with HCP activation and account linking
+- Name: ROSA activation and account linking
   File: cloud-experts-rosa-hcp-activation-and-account-linking-tutorial
-- Name: ROSA with HCP private offer acceptance and sharing
+- Name: ROSA private offer acceptance and sharing
   File: cloud-experts-rosa-with-hcp-private-offer-acceptance-and-sharing
 - Name: Deploying ROSA with a Custom DNS Resolver
   File: cloud-experts-custom-dns-resolver
@@ -141,8 +141,8 @@ Topics:
   File: cloud-experts-aws-secret-manager
 - Name: Using AWS Controllers for Kubernetes on ROSA
   File: cloud-experts-using-aws-ack
-- Name: Dynamically issuing certificates using the cert-manager Operator on ROSA
-  File: cloud-experts-dynamic-certificate-custom-domain
+#- Name: Dynamically issuing certificates using the cert-manager Operator on ROSA
+#  File: cloud-experts-dynamic-certificate-custom-domain
 - Name: Assigning consistent egress IP for external traffic
   File: cloud-experts-consistent-egress-ip
 # ---
@@ -161,14 +161,14 @@ Name: Prepare your environment
 Dir: rosa_planning
 Distros: openshift-rosa-hcp
 Topics:
-- Name: Prerequisites checklist for deploying ROSA with HCP
+- Name: Prerequisites checklist for deploying ROSA
   File: rosa-cloud-expert-prereq-checklist
-- Name: Detailed requirements for deploying ROSA with HCP
+- Name: Detailed requirements for deploying ROSA
   File: rosa-sts-aws-prereqs
 - Name: Required IAM roles and resources
   File: rosa-hcp-prepare-iam-roles-resources
 ##### NOTE: THE BELOW IS REMOVED AS PART OF OSDOCS-13310
-#- Name: ROSA with HCP limits and scalability
+#- Name: ROSA limits and scalability
 #  File: rosa-hcp-limits-scalability
 ##### NOTE: THE ABOVE IS REMOVED AS PART OF OSDOCS-13310
 - Name: Required AWS service quotas
@@ -178,33 +178,33 @@ Topics:
 - Name: Planning resource usage in your cluster
   File: rosa-planning-environment
 ---
-Name: Install ROSA with HCP clusters
+Name: Install ROSA clusters
 Dir: rosa_hcp
 Distros: openshift-rosa-hcp
 Topics:
-- Name: ROSA with HCP quick start guide
+- Name: ROSA quick start guide
   File: rosa-hcp-quickstart-guide
-- Name: Creating ROSA with HCP clusters using the default options
+- Name: Creating ROSA clusters using the default options
   File: rosa-hcp-sts-creating-a-cluster-quickly
 - Name: Creating a ROSA cluster using Terraform
   Dir: terraform
   Distros: openshift-rosa-hcp
   Topics:
   - Name: Creating a default ROSA cluster using Terraform
     File: rosa-hcp-creating-a-cluster-quickly-terraform
-- Name: Creating ROSA with HCP clusters using a custom AWS KMS encryption key
+- Name: Creating ROSA clusters using a custom AWS KMS encryption key
   File: rosa-hcp-creating-cluster-with-aws-kms-key
-- Name: Configuring a shared virtual private cloud for ROSA with HCP clusters
+- Name: Configuring a shared virtual private cloud for ROSA clusters
   File: rosa-hcp-shared-vpc-config
-- Name: Creating a private cluster on ROSA with HCP
+- Name: Creating a private cluster on ROSA
   File: rosa-hcp-aws-private-creating-cluster
-- Name: Creating ROSA with HCP clusters with egress zero
+- Name: Creating ROSA clusters with egress zero
   File: rosa-hcp-egress-zero-install
-- Name: Creating a ROSA with HCP cluster that uses direct authentication with an external OIDC identity provider
+- Name: Creating a ROSA cluster that uses direct authentication with an external OIDC identity provider
   File: rosa-hcp-sts-creating-a-cluster-ext-auth
-- Name: Creating ROSA with HCP clusters without a CNI plugin
+- Name: Creating ROSA clusters without a CNI plugin
   File: rosa-hcp-cluster-no-cni
-- Name: Deleting a ROSA with HCP cluster
+- Name: Deleting a ROSA cluster
   File: rosa-hcp-deleting-cluster
 ---
 Name: Web console
@@ -569,7 +569,7 @@ Name: Upgrading
 Dir: upgrading
 Distros: openshift-rosa-hcp
 Topics:
-- Name: Upgrading ROSA with HCP
+- Name: Upgrading ROSA
   File: rosa-hcp-upgrading
 ---
 Name: CI/CD

diff --git a/cloud_experts_tutorials/cloud-experts-aws-load-balancer-operator.adoc b/cloud_experts_tutorials/cloud-experts-aws-load-balancer-operator.adoc
@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="cloud-experts-aws-load-balancer-operator"]
-= Tutorial: AWS Load Balancer Operator on ROSA
+= Tutorial: AWS Load Balancer Operator on {product-title}
 include::_attributes/attributes-openshift-dedicated.adoc[]
 :context: cloud-experts-aws-load-balancer-operator
 
@@ -33,7 +33,7 @@ Load Balancers created by the AWS Load Balancer Operator cannot be used for link
 ====
 endif::openshift-rosa-hcp[]
 
-The link:https://kubernetes-sigs.github.io/aws-load-balancer-controller/[AWS Load Balancer Controller] manages AWS Elastic Load Balancers for a {product-title} (ROSA) cluster. The controller provisions link:https://docs.aws.amazon.com/elasticloadbalancing/latest/application/introduction.html[AWS Application Load Balancers (ALB)] when you create Kubernetes Ingress resources and link:https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html[AWS Network Load Balancers (NLB)] when implementing Kubernetes Service resources with a type of LoadBalancer.
+The link:https://kubernetes-sigs.github.io/aws-load-balancer-controller/[AWS Load Balancer Controller] manages AWS Elastic Load Balancers for a {product-title} cluster. The controller provisions link:https://docs.aws.amazon.com/elasticloadbalancing/latest/application/introduction.html[AWS Application Load Balancers (ALB)] when you create Kubernetes Ingress resources and link:https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html[AWS Network Load Balancers (NLB)] when implementing Kubernetes Service resources with a type of LoadBalancer.
 
 Compared with the default AWS in-tree load balancer provider, this controller is developed with advanced annotations for both ALBs and NLBs. Some advanced use cases are:
 
@@ -42,7 +42,7 @@ Compared with the default AWS in-tree load balancer provider, this controller is
 * Specify custom NLB source IP ranges
 * Specify custom NLB internal IP addresses
 
-The link:https://github.com/openshift/aws-load-balancer-operator[AWS Load Balancer Operator] is used to used to install, manage and configure an instance of `aws-load-balancer-controller` in a ROSA cluster.
+The link:https://github.com/openshift/aws-load-balancer-operator[AWS Load Balancer Operator] is used to used to install, manage and configure an instance of `aws-load-balancer-controller` in a {product-title} cluster.
 
 [id="prerequisites_{context}"]
 == Prerequisites
@@ -53,11 +53,10 @@ AWS ALBs require a multi-AZ cluster, as well as three public subnets split acros
 ====
 
 ifndef::openshift-rosa-hcp[]
-* xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[A multi-AZ ROSA classic cluster]
+* xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[A multi-AZ {product-title} cluster]
 endif::openshift-rosa-hcp[]
 ifdef::openshift-rosa-hcp[]
-* link:https://docs.openshift.com/rosa-hcp/rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.html[A multi-AZ ROSA cluster]
-endif::openshift-rosa-hcp[]
+* xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[A multi-AZ {product-title} cluster]
 * BYO VPC cluster
 * AWS CLI
 * OC CLI
@@ -87,7 +86,7 @@ $ echo "Cluster: ${ROSA_CLUSTER_NAME}, Region: ${REGION}, OIDC Endpoint: ${OIDC_
 This section only applies to clusters that were deployed into existing VPCs. If you did not deploy your cluster into an existing VPC, skip this section and proceed to the installation section below.
 ====
 
-. Set the below variables to the proper values for your ROSA deployment:
+. Set the below variables to the proper values for your cluster deployment:
 +
 [source,terminal]
 ----
@@ -131,7 +130,7 @@ $ aws ec2 create-tags \
 +
 [NOTE]
 ====
-The policy is sourced from link:https://raw.githubusercontent.com/kubernetes-sigs/aws-load-balancer-controller/v2.4.4/docs/install/iam_policy.json[the upstream AWS Load Balancer Controller policy] plus permission to create tags on subnets. This is required by the operator to function.
+The policy is sourced from link:https://raw.githubusercontent.com/kubernetes-sigs/aws-load-balancer-controller/v2.4.4/docs/install/iam_policy.json[the upstream AWS Load Balancer Controller policy] plus permission to create tags on subnets. This is required by the Operator to function.
 ====
 +
 [source,terminal]
@@ -235,7 +234,7 @@ spec:
 EOF
 ----
 +
-. Deploy an instance of the AWS Load Balancer Controller using the operator:
+. Deploy an instance of the AWS Load Balancer Controller using the Operator:
 +
 [NOTE]
 ====
@@ -255,7 +254,7 @@ spec:
 EOF
 ----
 +
-. Check the that the operator and controller pods are both running:
+. Check the that the Operator and controller pods are both running:
 +
 [source,terminal]
 ----

diff --git a/cloud_experts_tutorials/cloud-experts-aws-secret-manager.adoc b/cloud_experts_tutorials/cloud-experts-aws-secret-manager.adoc
@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="cloud-experts-aws-secret-manager"]
-= Tutorial: Using AWS Secrets Manager CSI on ROSA with STS
+= Tutorial: Using AWS Secrets Manager CSI on {product-title} with STS
 include::_attributes/attributes-openshift-dedicated.adoc[]
 :context: cloud-experts-aws-secret-manager
 
@@ -17,14 +17,14 @@ toc::[]
 //   - Chris Kang
 // ---
 
-The AWS Secrets and Configuration Provider (ASCP) provides a way to expose AWS Secrets as Kubernetes storage volumes. With the ASCP, you can store and manage your secrets in Secrets Manager and then retrieve them through your workloads running on {product-title} (ROSA).
+The AWS Secrets and Configuration Provider (ASCP) provides a way to expose AWS Secrets as Kubernetes storage volumes. With the ASCP, you can store and manage your secrets in Secrets Manager and then retrieve them through your workloads running on {product-title}.
 
 [id="cloud-experts-aws-secret-manager-prerequisites"]
 == Prerequisites
 
 Ensure that you have the following resources and tools before starting this process:
 
-* A ROSA cluster deployed with STS
+* A {product-title} cluster deployed with STS
 * Helm 3
 * `aws` CLI
 * `oc` CLI
@@ -34,7 +34,7 @@ Ensure that you have the following resources and tools before starting this proc
 [id="cloud-experts-aws-secret-manager-preparing-environment"]
 === Additional environment requirements
 
-. Log in to your ROSA cluster by running the following command:
+. Log in to your {product-title} cluster by running the following command:
 +
 [source,terminal]
 ----
@@ -58,12 +58,13 @@ $ oc get authentication.config.openshift.io cluster -o json \
 "https://xxxxx.cloudfront.net/xxxxx"
 ----
 +
-If your output is different, do not proceed. 
+If your output is different, do not proceed.
+See 
 ifndef::openshift-rosa-hcp[]
-See xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[Red{nbsp}Hat documentation on creating an STS cluster] before continuing this process.
+xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[Red{nbsp}Hat documentation on creating an STS cluster] before continuing this process.
 endif::openshift-rosa-hcp[]
 ifdef::openshift-rosa-hcp[]
-See link:https://docs.openshift.com/rosa-hcp/rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.html[Creating ROSA with HCP clusters using the default options] before continuing this process.
+xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[Red{nbsp}Hat documentation on creating an STS cluster] before continuing this process.
 endif::openshift-rosa-hcp[]
 
 . Set the `SecurityContextConstraints` permission to allow the CSI driver to run by running the following command:

diff --git a/cloud_experts_tutorials/cloud-experts-consistent-egress-ip.adoc b/cloud_experts_tutorials/cloud-experts-consistent-egress-ip.adoc
@@ -19,7 +19,7 @@ toc::[]
 
 You can assign a consistent IP address for traffic that leaves your cluster such as security groups which require an IP-based configuration to meet security standards.
 
-By default, {product-title} (ROSA) uses the OVN-Kubernetes container network interface (CNI) to assign random IP addresses from a pool. This can make configuring security lockdowns unpredictable or open.
+By default, {product-title} uses the OVN-Kubernetes container network interface (CNI) to assign random IP addresses from a pool. This can make configuring security lockdowns unpredictable or open.
 
 ifndef::openshift-rosa-hcp[]
 See xref:../networking/ovn_kubernetes_network_provider/configuring-egress-ips-ovn.adoc#configuring-egress-ips-ovn[Configuring an egress IP address] for more information.
@@ -34,15 +34,9 @@ endif::openshift-rosa-hcp[]
 
 .Prerequisites
 
-* A ROSA cluster deployed with OVN-Kubernetes
-ifndef::openshift-rosa-hcp[]
+* A {product-title} cluster deployed with OVN-Kubernetes
 * The xref:../cli_reference/openshift_cli/getting-started-cli.adoc#cli-getting-started[OpenShift CLI] (`oc`)
 * The xref:../cli_reference/rosa_cli/rosa-get-started-cli.adoc#rosa-get-started-cli[ROSA CLI] (`rosa`)
-endif::openshift-rosa-hcp[]
-ifdef::openshift-rosa-hcp[]
-* The link:https://docs.openshift.com/rosa/cli_reference/openshift_cli/getting-started-cli.html[OpenShift CLI] (`oc`)
-* The link:https://docs.openshift.com/rosa/cli_reference/rosa_cli/rosa-get-started-cli.html[ROSA CLI] (`rosa`)
-endif::openshift-rosa-hcp[]
 * link:https://stedolan.github.io/jq/[`jq`]