diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/content/bin/migrate-standalone-ha.cli b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/content/bin/migrate-standalone-ha.cli
index c415c5bd05..03225ba072 100644
--- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/content/bin/migrate-standalone-ha.cli
+++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/content/bin/migrate-standalone-ha.cli
@@ -932,4 +932,13 @@ if (result == undefined) of /subsystem=infinispan/cache-container=keycloak/distr
     echo
 end-if
 
+# Migrate from 15.0.0 to 16.0.0
+
+if (outcome == failed) of /subsystem=infinispan/cache-container=hibernate/local-cache=pending-puts/:read-resource
+    echo Add pending-puts local cache clustered and expiration time 60000L
+    /subsystem=infinispan/cache-container=hibernate/local-cache=pending-puts/:add
+    /subsystem=infinispan/cache-container=hibernate/local-cache=pending-puts/component=expiration/:write-attribute(name=max-idle,value=60000L)
+    echo
+end-if
+
 echo *** End Migration ***
diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/domain-keycloak-clustered.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/domain-keycloak-clustered.xml
index db5dbea1f3..123a28536a 100644
--- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/domain-keycloak-clustered.xml
+++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/domain-keycloak-clustered.xml
@@ -30,12 +30,13 @@
             <exclude spec="subsystem.resource-adapters"/>
             <exclude spec="subsystem.singleton"/>
             <exclude spec="subsystem.weld"/>
+            <exclude spec="subsystem.infinispan"/>
         </feature-group>
         <feature-group name="keycloak-server-subsystem"/>
         <feature-group name="datasources">
             <feature-group name="keycloak-datasource"/>
         </feature-group>
-        <feature-group name="infinispan-dist-keycloak"/>
+        <feature-group name="infinispan-dist"/>
     </feature>
 
     <feature spec="domain.system-property">
diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-hibernate.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-hibernate.xml
index 72c5179797..7393106cda 100644
--- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-hibernate.xml
+++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-hibernate.xml
@@ -33,6 +33,12 @@
                     <param name="size" value="10000"/>
                 </feature>
             </feature>
+            <feature spec="subsystem.infinispan.cache-container.local-cache">
+                <param name="local-cache" value="pending-puts"/>
+                <feature spec="subsystem.infinispan.cache-container.local-cache.component.expiration">
+                    <param name="max-idle" value="60000"/>
+                </feature>
+            </feature>
         </feature>
 
     </feature>
diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml
index 3b18008405..c1076d9508 100644
--- a/distribution/server-dist/pom.xml
+++ b/distribution/server-dist/pom.xml
@@ -333,6 +333,7 @@
                 </dependency>
             </dependencies>
             <build>
+                <finalName>${product.name}-${product.filename.version}</finalName>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>