diff --git a/example-zowe.yaml b/example-zowe.yaml
index 5b6b6fb512..9122f2cb01 100644
--- a/example-zowe.yaml
+++ b/example-zowe.yaml
@@ -565,17 +565,14 @@ components:
 
     storage:
       evictionStrategy: reject
-      # can be inMemory, VSAM, redis or infinispan
-      mode: VSAM
-      size: 10000
-      vsam:
-        # your VSAM data set created by "zwe init vsam" command or ZWECSVSM JCL
-        # this is required if storage mode is VSAM
-        name: ""
+      # can be infinispan, inMemory, redis or VSAM(deprecated)
+      mode: infinispan
       infinispan:
         # this is required if storage mode is infinispan
         jgroups:
           port: 7600
+          keyExchange:
+            port: 7601
 
   # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   app-server:
diff --git a/playbooks/all_host_vars_list.yml b/playbooks/all_host_vars_list.yml
index 93f9f01653..ab362790d5 100644
--- a/playbooks/all_host_vars_list.yml
+++ b/playbooks/all_host_vars_list.yml
@@ -39,10 +39,10 @@ zowe_apiml_security_oidc_client_id:
 zowe_apiml_security_oidc_client_secret:
 zowe_apiml_security_oidc_registry:
 zowe_apiml_security_zosmf_applid: IZUDFLT
-zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: AUTO
+zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: LTPA
 zowe_apiml_verify_certficates_of_services: true
 zowe_auto_create_user_group: false
-zowe_caching_service_persistent: VSAM
+zowe_caching_service_persistent: infinispan
 zowe_caching_service_port: 7555
 zowe_caching_service_vsam_dsprefix: CACHE
 zowe_caching_vsam_storage_class:
diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configfmid/defaults/main.yml
index 34b56b1682..ba662c7ebe 100644
--- a/playbooks/roles/configfmid/defaults/main.yml
+++ b/playbooks/roles/configfmid/defaults/main.yml
@@ -61,7 +61,7 @@ zowe_apiml_gateway_timeout_millis: 600000
 zowe_apiml_security_x509_enabled: false
 zowe_apiml_security_zosmf_applid: IZUDFLT
 zowe_apiml_security_auth_provider: zosmf
-zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: AUTO
+zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: LTPA
 zowe_apiml_security_oidc_enabled: false
 zowe_apiml_security_oidc_client_id:
 zowe_apiml_security_oidc_client_secret:
diff --git a/playbooks/roles/configure/defaults/main.yml b/playbooks/roles/configure/defaults/main.yml
index 39ad5e895f..62356c113f 100644
--- a/playbooks/roles/configure/defaults/main.yml
+++ b/playbooks/roles/configure/defaults/main.yml
@@ -63,7 +63,7 @@ zowe_apiml_security_x509_enabled: false
 zowe_apiml_service_forwardClientCertEnabled: true
 zowe_apiml_security_zosmf_applid: IZUDFLT
 zowe_apiml_security_auth_provider: zosmf
-zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: AUTO
+zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: LTPA
 zowe_apiml_security_oidc_enabled: false
 zowe_apiml_security_oidc_client_id:
 zowe_apiml_security_oidc_client_secret:
@@ -75,7 +75,7 @@ zowe_mvs_explorer_port: 7561
 zowe_uss_explorer_port: 7562
 # caching service
 zowe_caching_service_port: 7555
-zowe_caching_service_persistent: VSAM
+zowe_caching_service_persistent: infinispan
 # the final data set name will be: {zowe_dataset_prefix}.{zowe_caching_service_vsam_dsprefix}{zowe_instance_id}
 # for example: IBMUSER.ZWE.CACHE1
 zowe_caching_service_vsam_dsprefix: CACHE
diff --git a/playbooks/roles/custom_for_test/defaults/main.yml b/playbooks/roles/custom_for_test/defaults/main.yml
index 5209791295..884cdbbf8f 100644
--- a/playbooks/roles/custom_for_test/defaults/main.yml
+++ b/playbooks/roles/custom_for_test/defaults/main.yml
@@ -67,14 +67,14 @@ zowe_apiml_security_oidc_registry:
 zowe_apiml_security_oidc_jwks_uri:
 zowe_apiml_security_zosmf_applid: IZUDFLT
 zowe_apiml_security_auth_provider: zosmf
-zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: AUTO
+zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: LTPA
 # explorer APIs/plugins ports
 zowe_jobs_explorer_port: 7560
 zowe_mvs_explorer_port: 7561
 zowe_uss_explorer_port: 7562
 # caching service
 zowe_caching_service_port: 7555
-zowe_caching_service_persistent: VSAM
+zowe_caching_service_persistent: infinispan
 # the final data set name will be: {zowe_dataset_prefix}.{zowe_caching_service_vsam_dsprefix}{zowe_instance_id}
 # for example: IBMUSER.ZWE.CACHE1
 zowe_caching_service_vsam_dsprefix: CACHE
diff --git a/playbooks/roles/custom_for_test/tasks/main.yml b/playbooks/roles/custom_for_test/tasks/main.yml
index 4403348fad..ea85b09568 100644
--- a/playbooks/roles/custom_for_test/tasks/main.yml
+++ b/playbooks/roles/custom_for_test/tasks/main.yml
@@ -151,7 +151,7 @@
 
 # ============================================================================
 # Enable disabled services
-- name: Update zowe.yaml zowe.setup.vsam
+- name: Update zowe.yaml
   import_role:
     name: zos
     tasks_from: update_zowe_yaml
diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties
index 4eadca84d7..5859e80dbc 100644
--- a/workflows/files/ZWECONF.properties
+++ b/workflows/files/ZWECONF.properties
@@ -539,6 +539,22 @@ components_caching_service_storage_vsam_name=
 #  Port for jgroups. This is required if storage mode is infinispan.
 components_caching_service_storage_infinispan_jgroups_port=7600
 
+# components_caching_service_storage_infinispan_jgroups_host
+# Label: Caching service storage jgroups host
+# Abstract: Host for jgroups
+# Category: components
+# Description:
+#  Host for jgroups
+components_caching_service_storage_infinispan_jgroups_host=
+
+# components_caching_service_storage_infinispan_jgroups_keyExchange_port
+# Label: Caching service storage jgroups key exchange port
+# Abstract: Port for jgroups key exchang
+# Category: components
+# Description:
+#  Port for jgroups key exchange. This is required if storage mode is infinispan.
+components_caching_service_storage_infinispan_jgroups_keyExchange_port=7601
+
 # components_app_server_enabled
 # Label: Enable app server
 # Abstract: Check this option to enable the app server
diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml
index f0961c356b..d6a4a93a84 100644
--- a/workflows/files/ZWECONF.xml
+++ b/workflows/files/ZWECONF.xml
@@ -3,9 +3,9 @@
     <autoTakeOwnership>true</autoTakeOwnership>
     <!-- instance prefix settings -->
     <workflowInfo>
-        <workflowID scope="none">config_zowe_20</workflowID>
-        <workflowDefaultName>Configuration of Zowe 2.0</workflowDefaultName>
-        <workflowDescription>Use this workflow to configure the Zowe 2.0</workflowDescription>
+        <workflowID scope="none">config_zowe_30</workflowID>
+        <workflowDefaultName>Configuration of Zowe 3.0</workflowDefaultName>
+        <workflowDescription>Use this workflow to configure the Zowe 3.0</workflowDescription>
         <workflowVersion>###ZOWE_VERSION###</workflowVersion>
         <vendor>Zowe</vendor>
         <General/>
@@ -702,7 +702,7 @@ How we want to verify SSL certificates of services. Valid values are:
             <choice>redis</choice>
             <choice>infinispan</choice>
             <choice>VSAM</choice>
-            <default>VSAM</default>
+            <default>infinispan</default>
         </string>
     </variable>
     <variable name="components_caching_service_storage_size" scope="instance" visibility="public">
@@ -737,6 +737,24 @@ How we want to verify SSL certificates of services. Valid values are:
             <default>7600</default>
         </string>
     </variable>
+  <variable name="components_caching_service_storage_infinispan_jgroups_host" scope="instance" visibility="public">
+        <label>Caching service storage jgroups host</label>
+        <abstract>Host for jgroups</abstract>
+        <description>Host for jgroups. Default value is the same as Zowe host and it is used if storage mode is infinispan.</description>
+        <category>components</category>
+        <string valueMustBeChoice="false" multiLine="false"/>
+  </variable>
+  <variable name="components_caching_service_storage_infinispan_jgroups_keyExchange_port" scope="instance" visibility="public">
+        <label>Caching service storage jgroups keyExchange port</label>
+        <abstract>Port for jgroups key exchange</abstract>
+        <description>Port for jgroups key exchange. This is required if storage mode is infinispan.</description>
+        <category>components</category>
+        <string valueMustBeChoice="false" multiLine="false">
+            <!-- Put validation here -->
+            <!-- Specify choices here -->
+            <default>7601</default>
+        </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>
@@ -1303,7 +1321,7 @@ How we want to verify SSL certificates of services. Valid values are:
             <canMarkAsFailed>false</canMarkAsFailed>
             <!--template-->
         </step>
-        <step name="caching_service_vsam_variables" optional="false">
+        <step name="caching_service_vsam_variables" optional="true">
             <title>Variables for Caching Service - VSAM mode</title>
             <description>Specify the variables for the VSAM mode of Caching Service</description>
             <prereqStep name="caching_service_variables"/>
@@ -1323,10 +1341,10 @@ How we want to verify SSL certificates of services. Valid values are:
                     </extendStateExpression>
                 </targetStateSet>
             </condition>
-            <variableValue name="zowe_setup_vsam_mode" scope="instance" noPromptIfSet="false" required="true"/>
+            <variableValue name="zowe_setup_vsam_mode" scope="instance" noPromptIfSet="false" required="false"/>
             <variableValue name="zowe_setup_vsam_volume" scope="instance" noPromptIfSet="false" required="false"/>
             <variableValue name="zowe_setup_vsam_storageClass" scope="instance" noPromptIfSet="false" required="false"/>
-            <variableValue name="components_caching_service_storage_vsam_name" scope="instance" noPromptIfSet="false" required="true"/>
+            <variableValue name="components_caching_service_storage_vsam_name" scope="instance" noPromptIfSet="false" required="false"/>
             <instructions substitution="false">Run this step to specify the variables for the Caching Service</instructions>
             <weight>1</weight>
             <skills>z/OS System Programmer</skills>
@@ -1356,6 +1374,8 @@ How we want to verify SSL certificates of services. Valid values are:
                 </targetStateSet>
             </condition>
             <variableValue name="components_caching_service_storage_infinispan_jgroups_port" scope="instance" noPromptIfSet="false" required="false"/>
+            <variableValue name="components_caching_service_storage_infinispan_jgroups_host" scope="instance" noPromptIfSet="false" required="false"/>
+            <variableValue name="components_caching_service_storage_infinispan_jgroups_keyExchange_port" scope="instance" noPromptIfSet="false" required="false"/>
             <instructions substitution="false">Run this step to specify the variables for the Caching Service</instructions>
             <weight>1</weight>
             <skills>z/OS System Programmer</skills>
@@ -2104,8 +2124,14 @@ echo '        # this is required if storage mode is infinispan' >> "${instance-z
 echo '        jgroups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 #if (${instance-components_caching_service_storage_mode} == "infinispan" )
 echo '          port: ${instance-components_caching_service_storage_infinispan_jgroups_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '          host: ${instance-components_caching_service_storage_infinispan_jgroups_host}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '          keyExchange: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '            port: ${instance-components_caching_service_storage_infinispan_jgroups_keyExchange_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 #else
 echo '          port: 7600' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '          host: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '          keyExchange: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo '            port: 7601' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
 #end
 #end
 #if (${instance-components_caching_service_enabled} == "false" )