diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml
index 8156659..5de1142 100644
--- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml
+++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml
@@ -570,7 +570,7 @@
       - "{{inputs.parameters.worker_cpu}}"
       - "{{inputs.parameters.worker_memory}}"
       - "{{inputs.parameters.worker_volume_size}}"
-      - "{{inputs.parameters.worker.storage_class}}"
+      - "{{inputs.parameters.worker_storage_class}}"
       - "{{inputs.parameters.base_domain}}"
       - "{{inputs.parameters.mgmt_cluster_name}}"
       - "{{inputs.parameters.hosted_clusters_project}}"
@@ -680,7 +680,7 @@
       - "{{inputs.parameters.worker_cpu}}"
       - "{{inputs.parameters.worker_memory}}"
       - "{{inputs.parameters.worker_volume_size}}"
-      - "{{inputs.parameters.worker.storage_class}}"
+      - "{{inputs.parameters.worker_storage_class}}"
       - "{{inputs.parameters.base_domain}}"
       - "{{inputs.parameters.mgmt_cluster_name}}"
       - "{{inputs.parameters.hosted_clusters_project}}"
diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-create-openshift-cluster-and-bootstrap-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-create-openshift-cluster-and-bootstrap-wft.yaml
index 0f1567e..ab2a2b9 100644
--- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-create-openshift-cluster-and-bootstrap-wft.yaml
+++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-create-openshift-cluster-and-bootstrap-wft.yaml
@@ -44,16 +44,16 @@
     - name: k8s_version
 
     ## Specific parameters - Openshift
-    - name: control_plane_vm_size
-    - name: control_plane_node_count
-    - name: openstack_dns_nameservers
-    - name: openstack_external_network_id
-    - name: openstack_failure_domain
-    - name: openstack_ssh_key_name
-    - name: cluster_cni
-    - name: openstack_worker_image_name
-    - name: openstack_control_plane_image_name
-    - name: capo_resources_namespace
+    - name: openshift_release
+    - name: infra_public_ssh_key
+    - name: control_plane_availability
+    - name: worker_cpu
+    - name: worker_memory
+    - name: worker_volume_size
+    - name: worker_storage_class
+    - name: base_domain
+    - name: hosted_clusters_project
+    - name: etcd_volume_size
 
     # Specific parameters - Bootstrap and credentials
     - name: public_key_mgmt
@@ -120,16 +120,16 @@
       - name: secret_name_private_age_key_for_new_cluster
       - name: key_name_in_secret
       ## Openshift specific parameters
-      - name: control_plane_vm_size
-      - name: control_plane_node_count
-      - name: openstack_dns_nameservers
-      - name: openstack_external_network_id
-      - name: openstack_failure_domain
-      - name: openstack_ssh_key_name
-      - name: cluster_cni
-      - name: openstack_worker_image_name
-      - name: openstack_control_plane_image_name
-      - name: capo_resources_namespace
+      - name: openshift_release
+      - name: infra_public_ssh_key
+      - name: control_plane_availability
+      - name: worker_cpu
+      - name: worker_memory
+      - name: worker_volume_size
+      - name: worker_storage_class
+      - name: base_domain
+      - name: hosted_clusters_project
+      - name: etcd_volume_size
       # Other parameters - Recommended to keep defaults
       # - name: fleet_repo_url
       # - name: sw_catalogs_repo_url
@@ -201,11 +201,11 @@
     # ------ end of preparations for transaction
 
     # ------ Transformations
-    # Create CAPI cluster in cloud (Openstack)
+    # Create OpenShift cluster in cloud (using ACM)
     - - name: create-cluster
         templateRef:
           name: cluster-management-wft
-          template: create-capi-openstack-cluster
+          template: create-openshift-cluster
         arguments:
           parameters:
           # Volumes with cloned repos
@@ -238,27 +238,27 @@
             value: "{{inputs.parameters.secret_name_private_age_key_for_new_cluster}}"
           - name: key_name_in_secret
             value: "{{inputs.parameters.key_name_in_secret}}"
-          ## CAPI and CAPI Openstack specific parameters
-          - name: control_plane_vm_size
-            value: "{{inputs.parameters.control_plane_vm_size}}"
-          - name: control_plane_node_count
-            value: "{{inputs.parameters.control_plane_node_count}}"
-          - name: openstack_dns_nameservers
-            value: "{{inputs.parameters.openstack_dns_nameservers}}"
-          - name: openstack_external_network_id
-            value: "{{inputs.parameters.openstack_external_network_id}}"
-          - name: openstack_failure_domain
-            value: "{{inputs.parameters.openstack_failure_domain}}"
-          - name: openstack_ssh_key_name
-            value: "{{inputs.parameters.openstack_ssh_key_name}}"
-          - name: cluster_cni
-            value: "{{inputs.parameters.cluster_cni}}"
-          - name: openstack_worker_image_name
-            value: "{{inputs.parameters.openstack_worker_image_name}}"
-          - name: openstack_control_plane_image_name
-            value: "{{inputs.parameters.openstack_control_plane_image_name}}"
-          - name: capo_resources_namespace
-            value: "{{inputs.parameters.capo_resources_namespace}}"
+          ## OpenShift specific parameters
+          - name: openshift_release
+            value: "{{inputs.parameters.openshift_release}}"
+          - name: infra_public_ssh_key
+            value: "{{inputs.parameters.infra_public_ssh_key}}"
+          - name: control_plane_availability
+            value: "{{inputs.parameters.control_plane_availability}}"
+          - name: worker_cpu
+            value: "{{inputs.parameters.worker_cpu}}"
+          - name: worker_memory
+            value: "{{inputs.parameters.worker_memory}}"
+          - name: worker_volume_size
+            value: "{{inputs.parameters.worker_volume_size}}"
+          - name: worker_storage_class
+            value: "{{inputs.parameters.worker_storage_class}}"
+          - name: base_domain
+            value: "{{inputs.parameters.base_domain}}"
+          - name: hosted_clusters_project
+            value: "{{inputs.parameters.hosted_clusters_project}}"
+          - name: etcd_volume_size
+            value: "{{inputs.parameters.etcd_volume_size}}"
           ## Fed with `git_fleet_url` to avoid duplicates
           - name: fleet_repo_url
             value: "{{inputs.parameters.git_fleet_url}}"
@@ -299,7 +299,7 @@
           - name: git_volume_name
             value: '{{steps.generate-fleet-volume-repo.outputs.parameters.pvc-name}}'
           - name: commit_message
-            value: "Create CAPI Openstack cluster {{inputs.parameters.cluster_kustomization_name}} at {{inputs.parameters.providerconfig_name}}"
+            value: "Create OpenShift cluster {{inputs.parameters.cluster_kustomization_name}} at {{inputs.parameters.providerconfig_name}}"
           - name: main_branch
             value: main
           - name: contrib_branch
diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-update-openshift-cluster-and-bootstrap-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-update-openshift-cluster-and-bootstrap-wft.yaml
index b0a0693..1e62bfb 100644
--- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-update-openshift-cluster-and-bootstrap-wft.yaml
+++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-update-openshift-cluster-and-bootstrap-wft.yaml
@@ -44,16 +44,16 @@
     - name: k8s_version
 
     ## Specific parameters - Openshift
-    - name: control_plane_vm_size
-    - name: control_plane_node_count
-    - name: openstack_dns_nameservers
-    - name: openstack_external_network_id
-    - name: openstack_failure_domain
-    - name: openstack_ssh_key_name
-    - name: cluster_cni
-    - name: openstack_worker_image_name
-    - name: openstack_control_plane_image_name
-    - name: capo_resources_namespace
+    - name: openshift_release
+    - name: infra_public_ssh_key
+    - name: control_plane_availability
+    - name: worker_cpu
+    - name: worker_memory
+    - name: worker_volume_size
+    - name: worker_storage_class
+    - name: base_domain
+    - name: hosted_clusters_project
+    - name: etcd_volume_size
 
     # Specific parameters - Bootstrap and credentials
     - name: public_key_mgmt
@@ -118,16 +118,16 @@
       - name: secret_name_private_age_key_for_new_cluster
       - name: key_name_in_secret
       ## Openshift specific parameters
-      - name: control_plane_vm_size
-      - name: control_plane_node_count
-      - name: openstack_dns_nameservers
-      - name: openstack_external_network_id
-      - name: openstack_failure_domain
-      - name: openstack_ssh_key_name
-      - name: cluster_cni
-      - name: openstack_worker_image_name
-      - name: openstack_control_plane_image_name
-      - name: capo_resources_namespace
+      - name: openshift_release
+      - name: infra_public_ssh_key
+      - name: control_plane_availability
+      - name: worker_cpu
+      - name: worker_memory
+      - name: worker_volume_size
+      - name: worker_storage_class
+      - name: base_domain
+      - name: hosted_clusters_project
+      - name: etcd_volume_size
       # Other parameters - Recommended to keep defaults
       # - name: fleet_repo_url
       # - name: sw_catalogs_repo_url
@@ -195,11 +195,11 @@
     # ------ end of preparations for transaction
 
     # ------ Transformations
-    # Update CAPI cluster in cloud (Openstack)
+    # Update OpenShift cluster in cloud (using ACM)
     - - name: update-cluster
         templateRef:
           name: cluster-management-wft
-          template: update-capi-openstack-cluster
+          template: update-openshift-cluster
         arguments:
           parameters:
           # Volumes with cloned repos
@@ -232,27 +232,27 @@
             value: "{{inputs.parameters.secret_name_private_age_key_for_new_cluster}}"
           - name: key_name_in_secret
             value: "{{inputs.parameters.key_name_in_secret}}"
-          ## CAPI and CAPI Openstack specific parameters
-          - name: control_plane_vm_size
-            value: "{{inputs.parameters.control_plane_vm_size}}"
-          - name: control_plane_node_count
-            value: "{{inputs.parameters.control_plane_node_count}}"
-          - name: openstack_dns_nameservers
-            value: "{{inputs.parameters.openstack_dns_nameservers}}"
-          - name: openstack_external_network_id
-            value: "{{inputs.parameters.openstack_external_network_id}}"
-          - name: openstack_failure_domain
-            value: "{{inputs.parameters.openstack_failure_domain}}"
-          - name: openstack_ssh_key_name
-            value: "{{inputs.parameters.openstack_ssh_key_name}}"
-          - name: cluster_cni
-            value: "{{inputs.parameters.cluster_cni}}"
-          - name: openstack_worker_image_name
-            value: "{{inputs.parameters.openstack_worker_image_name}}"
-          - name: openstack_control_plane_image_name
-            value: "{{inputs.parameters.openstack_control_plane_image_name}}"
-          - name: capo_resources_namespace
-            value: "{{inputs.parameters.capo_resources_namespace}}"
+          ## OpenShift specific parameters
+          - name: openshift_release
+            value: "{{inputs.parameters.openshift_release}}"
+          - name: infra_public_ssh_key
+            value: "{{inputs.parameters.infra_public_ssh_key}}"
+          - name: control_plane_availability
+            value: "{{inputs.parameters.control_plane_availability}}"
+          - name: worker_cpu
+            value: "{{inputs.parameters.worker_cpu}}"
+          - name: worker_memory
+            value: "{{inputs.parameters.worker_memory}}"
+          - name: worker_volume_size
+            value: "{{inputs.parameters.worker_volume_size}}"
+          - name: worker_storage_class
+            value: "{{inputs.parameters.worker_storage_class}}"
+          - name: base_domain
+            value: "{{inputs.parameters.base_domain}}"
+          - name: hosted_clusters_project
+            value: "{{inputs.parameters.hosted_clusters_project}}"
+          - name: etcd_volume_size
+            value: "{{inputs.parameters.etcd_volume_size}}"
           ## Fed with `git_fleet_url` to avoid duplicates
           - name: fleet_repo_url
             value: "{{inputs.parameters.git_fleet_url}}"
@@ -293,7 +293,7 @@
           - name: git_volume_name
             value: '{{steps.generate-fleet-volume-repo.outputs.parameters.pvc-name}}'
           - name: commit_message
-            value: "Update CAPI Openstack cluster {{inputs.parameters.cluster_kustomization_name}} at {{inputs.parameters.providerconfig_name}}"
+            value: "Update OpenShift cluster {{inputs.parameters.cluster_kustomization_name}} at {{inputs.parameters.providerconfig_name}}"
           - name: main_branch
             value: main
           - name: contrib_branch