diff --git a/releases/22.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/22.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2..4e925c03 100644
--- a/releases/22.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/22.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -11,8 +11,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/22.0.0.12/full/helpers/build/infinispan-client-setup.sh b/releases/22.0.0.12/full/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/22.0.0.12/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/22.0.0.12/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/22.0.0.12/full/helpers/runtime/docker-server.sh b/releases/22.0.0.12/full/helpers/runtime/docker-server.sh
index f5abe398..f4051878 100755
--- a/releases/22.0.0.12/full/helpers/runtime/docker-server.sh
+++ b/releases/22.0.0.12/full/helpers/runtime/docker-server.sh
@@ -88,6 +88,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -112,6 +114,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+   export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/22.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/22.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index d835cb4e..3076fccc 100644
--- a/releases/22.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/22.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,6 +1,6 @@
 <server>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -8,8 +8,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/23.0.0.3/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/23.0.0.3/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2..4e925c03 100644
--- a/releases/23.0.0.3/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/23.0.0.3/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -11,8 +11,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/23.0.0.3/full/helpers/build/infinispan-client-setup.sh b/releases/23.0.0.3/full/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/23.0.0.3/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/23.0.0.3/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/23.0.0.3/full/helpers/runtime/docker-server.sh b/releases/23.0.0.3/full/helpers/runtime/docker-server.sh
index 40a81a78..e7caef75 100755
--- a/releases/23.0.0.3/full/helpers/runtime/docker-server.sh
+++ b/releases/23.0.0.3/full/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/23.0.0.3/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/23.0.0.3/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index d835cb4e..3076fccc 100644
--- a/releases/23.0.0.3/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/23.0.0.3/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,6 +1,6 @@
 <server>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -8,8 +8,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/23.0.0.3/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/23.0.0.3/kernel-slim/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/23.0.0.3/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/23.0.0.3/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/23.0.0.3/kernel-slim/helpers/runtime/docker-server.sh b/releases/23.0.0.3/kernel-slim/helpers/runtime/docker-server.sh
index 40a81a78..e7caef75 100755
--- a/releases/23.0.0.3/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/23.0.0.3/kernel-slim/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/23.0.0.5/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/23.0.0.5/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2..4e925c03 100644
--- a/releases/23.0.0.5/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/23.0.0.5/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -11,8 +11,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/23.0.0.5/full/helpers/build/infinispan-client-setup.sh b/releases/23.0.0.5/full/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/23.0.0.5/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/23.0.0.5/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/23.0.0.5/full/helpers/runtime/docker-server.sh b/releases/23.0.0.5/full/helpers/runtime/docker-server.sh
index 40a81a78..e7caef75 100755
--- a/releases/23.0.0.5/full/helpers/runtime/docker-server.sh
+++ b/releases/23.0.0.5/full/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/23.0.0.5/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/23.0.0.5/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index d835cb4e..3076fccc 100644
--- a/releases/23.0.0.5/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/23.0.0.5/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,6 +1,6 @@
 <server>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -8,8 +8,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/23.0.0.5/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/23.0.0.5/kernel-slim/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/23.0.0.5/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/23.0.0.5/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/23.0.0.5/kernel-slim/helpers/runtime/docker-server.sh b/releases/23.0.0.5/kernel-slim/helpers/runtime/docker-server.sh
index 40a81a78..e7caef75 100755
--- a/releases/23.0.0.5/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/23.0.0.5/kernel-slim/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2..4e925c03 100644
--- a/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -11,8 +11,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/latest/beta/helpers/build/infinispan-client-setup.sh b/releases/latest/beta/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/latest/beta/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/beta/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/beta/helpers/runtime/docker-server.sh b/releases/latest/beta/helpers/runtime/docker-server.sh
index 4a1849d7..703ed83b 100755
--- a/releases/latest/beta/helpers/runtime/docker-server.sh
+++ b/releases/latest/beta/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+   export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index e2ec72d2..4e925c03 100644
--- a/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,7 +3,7 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -11,8 +11,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/latest/full/helpers/build/infinispan-client-setup.sh b/releases/latest/full/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/latest/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/full/helpers/runtime/docker-server.sh b/releases/latest/full/helpers/runtime/docker-server.sh
index 40a81a78..269a164b 100755
--- a/releases/latest/full/helpers/runtime/docker-server.sh
+++ b/releases/latest/full/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+   export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 
diff --git a/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
index d835cb4e..4e925c03 100644
--- a/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
+++ b/releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,6 +1,9 @@
 <server>
+  <featureManager>
+    <feature>sessionCache-1.0</feature>
+  </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
@@ -8,8 +11,8 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>
diff --git a/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/kernel-slim/helpers/runtime/docker-server.sh b/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
index 40a81a78..e7caef75 100755
--- a/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi