diff --git a/example-zowe.yaml b/example-zowe.yaml
index 1f8a36c801..b70fbc81e8 100644
--- a/example-zowe.yaml
+++ b/example-zowe.yaml
@@ -39,7 +39,7 @@ zowe:
     # MVS data set related configurations
     dataset:
       # **COMMONLY_CUSTOMIZED**
-      # where Zowe MVS data sets will be installed
+      # where are existing Zowe SZWEEXEC Target libraries
       prefix: IBMUSER.ZWEV2
       # **COMMONLY_CUSTOMIZED**
       # PROCLIB where Zowe STCs will be copied over
@@ -469,17 +469,17 @@ java:
 
 
 #-------------------------------------------------------------------------------
-# node.js configuration
+# Node.js configuration
 #
-# Some Zowe components requires node.js. Define the path where you have your
-# node.js is installed.
+# Some Zowe components requires Node.js. Define the path where you have your
+# Node.js is installed.
 #
 # **NOTE**: this field can be updated automatically if you pass `--update-config`
 # to `zwe init` command.
 #-------------------------------------------------------------------------------
 node:
   # **COMMONLY_CUSTOMIZED**
-  # Path to your node.js home directory
+  # Path to your Node.js home directory
   home: ""
 
 
@@ -667,7 +667,7 @@ components:
 #     # for this HA instance, we did not customize "components", so it will use default value.
   
 #   # HA instance ID, we will start 2 instances on LPAR2
-#   # **NOTE**, we can only start one gateway in same LPAR.
+#   # **NOTE**, we can only start one Gateway in same LPAR.
 #   lpar2a:
 #     # hostname where this instance will be started
 #     hostname: lpar2.my-company.com
diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties
index 876020cab4..5e76d2b27e 100644
--- a/workflows/files/ZWECONF.properties
+++ b/workflows/files/ZWECONF.properties
@@ -140,10 +140,10 @@ zowe_job_prefix=ZWE1
 
 # zowe_externalDomains
 # Label: Zowe external domains
-# Abstract: This should be the domain name of your Dynamic VIP Address (DVIPA)
+# Abstract: The list of external domains
 # Category: zowe
 # Description:
-#  This should be the domain name of your Dynamic VIP Address (DVIPA)
+#  Defines a list of external domains that will be used by the Zowe instance.
 zowe_externalDomains=sample-domain.com
 
 # zowe_externalPort
diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml
index 264511d15e..cbc5eb9963 100644
--- a/workflows/files/ZWECONF.xml
+++ b/workflows/files/ZWECONF.xml
@@ -12,9 +12,9 @@
     </workflowInfo>
     <!--variables-->
     <variable name="zowe_setup_dataset_prefix" scope="instance" visibility="public">
-        <label>Zowe setup MVS prefix</label>
-        <abstract>Where Zowe MVS data sets will be installed</abstract>
-        <description>Where Zowe MVS data sets will be installed</description>
+        <label>Prefix of existing Zowe SZWEEXEC Target libraries</label>
+        <abstract>Prefix of existing SZWEEXEC Target libraries created during PSWI or SMP/E</abstract>
+        <description>Prefix of existing SZWEEXEC Target libraries created during PSWI or SMP/E installation phase</description>
         <category>zowe</category>
         <string valueMustBeChoice="false" multiLine="false">
             <!-- Put validation here -->
@@ -202,8 +202,8 @@ It is used by ZWESLSTC or by zwe command</description>
     </variable>
     <variable name="zowe_externalDomains" scope="instance" visibility="public">
         <label>Zowe external domains</label>
-        <abstract>The domain name of your Dynamic VIP Address (DVIPA)</abstract>
-        <description>The domain name of your Dynamic VIP Address (DVIPA)</description>
+        <abstract>The list of external domains</abstract>
+        <description>Defines a list of external domains that will be used by the Zowe instance.</description>
         <category>zowe</category>
         <string valueMustBeChoice="false" multiLine="true">
             <!-- Put validation here -->
@@ -405,10 +405,10 @@ How we want to verify SSL certificates of services. Valid values are:
         </string>
     </variable>
     <variable name="node_home" scope="instance" visibility="public">
-        <label>NodeJS home</label>
-        <abstract>Path to the NodeJS home</abstract>
-        <description>Path to the NodeJS home</description>
-        <category>node</category>
+        <label>Node.js home</label>
+        <abstract>Path to the Node.js home</abstract>
+        <description>Path to the Node.js home</description>
+        <category>Node.js</category>
         <string valueMustBeChoice="false" multiLine="false">
             <!-- Put validation here -->
             <!-- Specify choices here -->
@@ -448,9 +448,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </string>
     </variable>
     <variable name="components_gateway_enabled" scope="instance" visibility="public">
-        <label>Enable the gateway</label>
-        <abstract>Check this option to enable the gateway</abstract>
-        <description>Check this option to enable the gateway</description>
+        <label>Enable Gateway</label>
+        <abstract>Check this option to enable Gateway</abstract>
+        <description>Check this option to enable Gateway</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -460,8 +460,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_port" scope="instance" visibility="public">
         <label>Gateway port</label>
-        <abstract>Port for the API ML gateway</abstract>
-        <description>Port for the API ML gateway</description>
+        <abstract>Port for the APIML Gateway</abstract>
+        <description>Port for the APIML Gateway</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -482,8 +482,8 @@ How we want to verify SSL certificates of services. Valid values are:
   </variable>
     <variable name="components_gateway_debug" scope="instance" visibility="public">
         <label>Gateway debug</label>
-        <abstract>Switch on the debug mode for the gateway</abstract>
-        <description>Switch on the debug mode for the gateway</description>
+        <abstract>Switch on the debug mode for Gateway</abstract>
+        <description>Switch on the debug mode for Gateway</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -493,8 +493,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_apiml_security_auth_provider" scope="instance" visibility="public">
         <label>Gateway APIML security auth provider</label>
-        <abstract>Authorization provider for the gateway</abstract>
-        <description>Authorization provider for the gateway</description>
+        <abstract>Authorization provider for the Gateway</abstract>
+        <description>Authorization provider for the Gateway</description>
         <category>components</category>
         <string valueMustBeChoice="false" multiLine="false">
             <!-- Put validation here -->
@@ -504,8 +504,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_apiml_security_auth_zosmf_jwtAutoconfiguration" scope="instance" visibility="public">
         <label>Gateway APIML security auth z/OSMF jwtAutoconfiguration</label>
-        <abstract>JWT auto configuration for gateway security auth</abstract>
-        <description>JWT auto configuration for gateway security auth</description>
+        <abstract>JWT auto configuration for Gateway security auth</abstract>
+        <description>JWT auto configuration for Gateway security auth</description>
         <category>components</category>
         <string valueMustBeChoice="false" multiLine="false">
             <!-- Put validation here -->
@@ -515,8 +515,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_apiml_security_auth_zosmf_serviceId" scope="instance" visibility="public">
         <label>Gateway APIML security auth z/OSMF serviceId</label>
-        <abstract>Service ID for gateway security auth</abstract>
-        <description>Service ID for gateway security auth</description>
+        <abstract>Service ID for Gateway security auth</abstract>
+        <description>Service ID for Gateway security auth</description>
         <category>components</category>
         <string valueMustBeChoice="false" multiLine="false">
             <!-- Put validation here -->
@@ -537,8 +537,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_apiml_security_authorization_provider" scope="instance" visibility="public">
         <label>Gateway APIML security authorization provider</label>
-        <abstract>Security authorization provider for the gateway</abstract>
-        <description>Security authorization provider for the gateway</description>
+        <abstract>Security authorization provider for the Gateway</abstract>
+        <description>Security authorization provider for the Gateway</description>
         <category>components</category>
         <string valueMustBeChoice="false" multiLine="false">
             <!-- Put validation here -->
@@ -547,8 +547,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_gateway_apiml_security_x509_enabled" scope="instance" visibility="public">
         <label>Enable gateway APIML security x509</label>
-        <abstract>Check to enable the gateway security x509</abstract>
-        <description>Check to enable the gateway security x509</description>
+        <abstract>Check to enable the Gateway security x509</abstract>
+        <description>Check to enable the Gateway security x509</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -657,8 +657,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_api_catalog_enabled" scope="instance" visibility="public">
         <label>Enable API Catalog</label>
-        <abstract>Check this option to enable the API Catalog</abstract>
-        <description>Check this option to enable the API Catalog</description>
+        <abstract>Check this option to enable API Catalog</abstract>
+        <description>Check this option to enable API Catalog</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -689,9 +689,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
     <variable name="components_discovery_enabled" scope="instance" visibility="public">
-        <label>Enable the Discovery service</label>
-        <abstract>Check this option to enable the Discovery service</abstract>
-        <description>Check this option to enable the Discovery service</description>
+        <label>Enable Discovery service</label>
+        <abstract>Check this option to enable Discovery service</abstract>
+        <description>Check this option to enable Discovery service</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -701,8 +701,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_discovery_port" scope="instance" visibility="public">
         <label>Discovery port</label>
-        <abstract>Port on which the Discovery service should be running</abstract>
-        <description>Port on which the Discovery service should be running</description>
+        <abstract>Port on which Discovery service should be running</abstract>
+        <description>Port on which Discovery service should be running</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -722,9 +722,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </boolean>
     </variable>
     <variable name="components_caching_service_enabled" scope="instance" visibility="public">
-        <label>Enable the Caching service</label>
-        <abstract>Check this option to enable the Caching service</abstract>
-        <description>Check this option to enable the Caching service</description>
+        <label>Enable Caching service</label>
+        <abstract>Check this option to enable Caching service</abstract>
+        <description>Check this option to enable Caching service</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -734,8 +734,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_caching_service_port" scope="instance" visibility="public">
         <label>Caching service port</label>
-        <abstract>Port for the caching service</abstract>
-        <description>Port for the caching service</description>
+        <abstract>Port for Caching service</abstract>
+        <description>Port for Caching service</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -815,9 +815,9 @@ How we want to verify SSL certificates of services. Valid values are:
         </string>
     </variable>
     <variable name="components_app_server_enabled" scope="instance" visibility="public">
-        <label>Enable the app server</label>
-        <abstract>Check this option to enable the app server</abstract>
-        <description>Check this option to enable the app server.</description>
+        <label>Enable App server</label>
+        <abstract>Check this option to enable App server</abstract>
+        <description>Check this option to enable App server.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -838,8 +838,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_app_server_port" scope="instance" visibility="public">
         <label>App server port</label>
-        <abstract>Port for the app server</abstract>
-        <description>Port for the app server</description>
+        <abstract>Port for App server</abstract>
+        <description>Port for App server</description>
         <category>components</category>
         <integer>
             <!-- Put validation here -->
@@ -970,8 +970,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_explorer_jes_enabled" scope="instance" visibility="public">
         <label>Enable explorer JES</label>
-        <abstract>Check this option to enable the JES explorer</abstract>
-        <description>Check this option to enable the JES explorer.</description>
+        <abstract>Check this option to enable JES explorer</abstract>
+        <description>Check this option to enable JES explorer.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -981,8 +981,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_explorer_mvs_enabled" scope="instance" visibility="public">
         <label>Enable explorer MVS</label>
-        <abstract>Check this option to enable the MVS explorer</abstract>
-        <description>Check this option to enable the MVS explorer.</description>
+        <abstract>Check this option to enable MVS explorer</abstract>
+        <description>Check this option to enable MVS explorer.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -992,8 +992,8 @@ How we want to verify SSL certificates of services. Valid values are:
     </variable>
     <variable name="components_explorer_uss_enabled" scope="instance" visibility="public">
         <label>Enable explorer USS</label>
-        <abstract>Check this option to enable the USS explorer</abstract>
-        <description>Check this option to enable the USS explorer.</description>
+        <abstract>Check this option to enable USS explorer</abstract>
+        <description>Check this option to enable USS explorer.</description>
         <category>components</category>
         <boolean>
             <!-- Put validation here -->
@@ -1640,7 +1640,7 @@ echo '  setup:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '    # MVS data set related configurations' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '    dataset:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '      # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo '      # where Zowe MVS data sets will be installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '      # where are existing Zowe SZWEEXEC Target libraries' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '      prefix: $!{instance-zowe_setup_dataset_prefix}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '      # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '      # PROCLIB where Zowe STCs will be copied over' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
@@ -2055,17 +2055,17 @@ echo '  home: "$!{instance-java_home}"' >> "${instance-zowe_runtimeDirectory}/zo
 echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '#-------------------------------------------------------------------------------' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo '# node.js configuration' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '# Node.js configuration' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo '# Some Zowe components requires node.js. Define the path where you have your' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo '# node.js is installed.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '# Some Zowe components requires Node.js. Define the path where you have your' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '# Node.js is installed.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '# **NOTE**: this field can be updated automatically if you pass `--update-config`' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '# to `zwe init` command.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '#-------------------------------------------------------------------------------' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo 'node:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '  # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo '  # Path to your node.js home directory' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '  # Path to your Node.js home directory' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '  home: "$!{instance-node_home}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
@@ -2383,7 +2383,7 @@ echo '#     sysname: LPR1' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '#     # for this HA instance, we did not customize "components", so it will use default value.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '#   # HA instance ID, we will start 2 instances on LPAR2' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo '#   # **NOTE**, we can only start one gateway in same LPAR.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '#   # **NOTE**, we can only start one Gateway in same LPAR.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '#   lpar2a:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '#     # hostname where this instance will be started' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 echo '#     hostname: lpar2.my-company.com' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
@@ -2487,8 +2487,8 @@ zwe install -c '${instance-zowe_runtimeDirectory}/zowe.yaml' --allow-overwrite</
             </template>
         </step>
         <step name="init_zowe" optional="false">
-            <title>Run the Zowe init</title>
-            <description>Executes the Zowe initialization</description>
+            <title>Run scripts for Zowe initialization</title>
+            <description>Executes scripts for Zowe initialization</description>
             <prereqStep name="install_zowe"/>
             <!-- condition -->
             <!--variableValues-->
@@ -2504,11 +2504,10 @@ zwe install -c '${instance-zowe_runtimeDirectory}/zowe.yaml' --allow-overwrite</
             Each <b>zwe init</b> sub-command defines a configuration. 
 <ul>
 <li><b>mvs:</b> Copy the data sets provided with Zowe to custom data sets.</li>
-<li><b>security:</b> Create the user IDs and security manager settings.</li>
-<li><b>apfauth:</b> APF authorize the LOADLIB containing the modules that need to perform z/OS priviledged security calls.</li>
-<li><b>certificate:</b> Configure Zowe to use TLS certificates.</li>
-<li><b>vsam:</b> Configure the VSAM files needed to run the Zowe caching service used for high availability (HA).</li>
 <li><b>stc:</b> Configure the system to launch the Zowe started task.</li>
+#if (${instance-components_caching_service_storage_mode} == "VSAM" && ${instance-components_caching_service_enabled})
+<li><b>vsam:</b> Configure the VSAM files needed to run the Zowe caching service used for high availability (HA).</li>
+#end
 </ul>
             ]]></instructions>
             <weight>1</weight>
@@ -2535,24 +2534,20 @@ zwe init vsam -c '${instance-zowe_runtimeDirectory}/zowe.yaml' --allow-overwrite
             </template>
         </step>
         <step name="init_zowe_security" optional="false">
-            <title>Run the Zowe init security</title>
-            <description>Executes the Zowe initialization for security setup</description>
+            <title>Run scripts for Zowe security initialization</title>
+            <description>Executes Zowe initialization scripts for security setup</description>
             <prereqStep name="install_zowe"/>
             <!--variableValues-->
             <instructions substitution="true"><![CDATA[
             This step runs the commands: <br/>
-            <code>zwe init apfauth -c ${instance-zowe_runtimeDirectory}/zowe.yml</code> <br/>
             <code>zwe init security -c ${instance-zowe_runtimeDirectory}/zowe.yml --allow-overwrite</code> <br/>
+            <code>zwe init apfauth -c ${instance-zowe_runtimeDirectory}/zowe.yml</code> <br/>            
             <br/>
             <b>NOTE:</b>
             Each <b>zwe init</b> sub-command defines a configuration. 
 <ul>
-<li><b>mvs:</b> Copy the data sets provided with Zowe to custom data sets.</li>
 <li><b>security:</b> Create the user IDs and security manager settings.</li>
 <li><b>apfauth:</b> APF authorize the LOADLIB containing the modules that need to perform z/OS priviledged security calls.</li>
-<li><b>certificate:</b> Configure Zowe to use TLS certificates.</li>
-<li><b>vsam:</b> Configure the VSAM files needed to run the Zowe caching service used for high availability (HA).</li>
-<li><b>stc:</b> Configure the system to launch the Zowe started task.</li>
 </ul>
             ]]></instructions>
             <weight>1</weight>
diff --git a/workflows/files/ZWECRECR.xml b/workflows/files/ZWECRECR.xml
index c5d3c3b812..094f05cc32 100644
--- a/workflows/files/ZWECRECR.xml
+++ b/workflows/files/ZWECRECR.xml
@@ -33,7 +33,7 @@
     <variable name="esm" scope="instance" visibility="public">
         <label>Security Manager</label>
         <abstract>Please, specify your security management software</abstract>
-        <description>Please, specify the ESM system you use on your workstation</description>
+        <description>Please, specify the ESM system you use</description>
         <category>General</category>
         <string valueMustBeChoice="true" multiLine="false">
             <!-- Put validation here -->
@@ -276,7 +276,8 @@ TSS GENREQ(${instance-tss_acid}) +
                 </targetStateSet>
             </condition>
             <!--variableValues-->
-            <instructions substitution="true">This step will generate the CSR request into the ${instance-output_dataset}</instructions>
+            <instructions substitution="true"><![CDATA[This step will generate the CSR request into the ${instance-output_dataset}
+<p>This step uses ACF2 command <a href="https://techdocs.broadcom.com/us/en/ca-mainframe-software/security/ca-acf2-for-z-os/16-0/administrating/digital-certificate-support/process-digital-certificates-with-acf2/genreq-subcommand.html">GENREQ</a></p>]]></instructions>
             <weight>1</weight>
             <skills>Security Administrator</skills>
             <autoEnable>true</autoEnable>
@@ -302,8 +303,7 @@ GENREQ ${instance-acf2_acid} +
         <prereqStep name="generate_csr"/>
         <!-- condition -->
         <!--variableValues-->
-        <instructions substitution="true"><![CDATA[Copies the CSR to the ${instance-uss_output_folder}request.csr
-<p>This step uses ACF2 command <a href="https://techdocs.broadcom.com/us/en/ca-mainframe-software/security/ca-acf2-for-z-os/16-0/command-reference/acf-subcommands/genreq-subcommand.html">GENREQ</a></p>]]></instructions>
+        <instructions substitution="true"><![CDATA[Copies the CSR to the ${instance-uss_output_folder}request.csr]]></instructions>
         <weight>1</weight>
         <skills>Security Administrator</skills>
         <autoEnable>true</autoEnable>