diff --git a/.secrets.baseline b/.secrets.baseline
index a99a0bbd8..b6682dacc 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-05-06T17:54:19Z",
+  "generated_at": "2025-06-03T18:12:06Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -373,7 +373,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/full/server.xml": [
+    "ga/25.0.0.6/full/server.xml": [
       {
         "hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
         "is_secret": false,
@@ -383,7 +383,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubi.ibmjava8": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubi.ibmjava8": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -393,7 +393,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk11": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk11": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -403,7 +403,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk17": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk17": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -413,7 +413,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk8": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk8": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -423,7 +423,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.ibmjava8": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -433,7 +433,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk11": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk11": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -443,7 +443,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk17": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk17": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -453,7 +453,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk21": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk21": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -463,7 +463,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk8": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk8": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -473,7 +473,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubuntu.ibmjava8": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -483,7 +483,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk11": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk11": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -493,7 +493,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk17": [
+    "ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk17": [
       {
         "hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
         "is_secret": false,
@@ -503,7 +503,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/helpers/build/configuration_snippets/keystore.xml": [
+    "ga/25.0.0.6/kernel/helpers/build/configuration_snippets/keystore.xml": [
       {
         "hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
         "is_secret": false,
@@ -513,7 +513,7 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/helpers/build/configuration_snippets/truststore.xml": [
+    "ga/25.0.0.6/kernel/helpers/build/configuration_snippets/truststore.xml": [
       {
         "hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
         "is_secret": false,
@@ -523,17 +523,17 @@
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/kernel/helpers/runtime/docker-server.sh": [
+    "ga/25.0.0.6/kernel/helpers/runtime/docker-server.sh": [
       {
         "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 138,
+        "line_number": 141,
         "type": "Secret Keyword",
         "verified_result": null
       }
     ],
-    "ga/25.0.0.5/oidcProvider/server.xml": [
+    "ga/25.0.0.6/oidcProvider/server.xml": [
       {
         "hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
         "is_secret": false,
@@ -706,7 +706,7 @@
         "hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 138,
+        "line_number": 141,
         "type": "Secret Keyword",
         "verified_result": null
       }
diff --git a/ga/25.0.0.5/images.txt b/ga/25.0.0.5/images.txt
deleted file mode 100644
index d06c1f1e0..000000000
--- a/ga/25.0.0.5/images.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-websphere-liberty:25.0.0.5-kernel                      ../ga/25.0.0.5/kernel     ../ga/25.0.0.5/kernel/Dockerfile.ubuntu.ibmjava8
-websphere-liberty:25.0.0.5-kernel-java11-openj9        ../ga/25.0.0.5/kernel     ../ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk11
-websphere-liberty:25.0.0.5-kernel-java17-openj9        ../ga/25.0.0.5/kernel     ../ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk17
-websphere-liberty:25.0.0.5-kernel-java8-ibmjava-ubi    ../ga/25.0.0.5/kernel     ../ga/25.0.0.5/kernel/Dockerfile.ubi.ibmjava8
-websphere-liberty:25.0.0.5-kernel-java8-openj9-ubi     ../ga/25.0.0.5/kernel     ../ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk8
-websphere-liberty:25.0.0.5-kernel-java11-openj9-ubi    ../ga/25.0.0.5/kernel     ../ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk11
-websphere-liberty:25.0.0.5-kernel-java17-openj9-ubi    ../ga/25.0.0.5/kernel     ../ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk17
-websphere-liberty:25.0.0.5-full                        ../ga/25.0.0.5/full       ../ga/25.0.0.5/full/Dockerfile.ubuntu.ibmjava8
-websphere-liberty:25.0.0.5-full-java11-openj9          ../ga/25.0.0.5/full       ../ga/25.0.0.5/full/Dockerfile.ubuntu.openjdk11
-websphere-liberty:25.0.0.5-full-java17-openj9          ../ga/25.0.0.5/full       ../ga/25.0.0.5/full/Dockerfile.ubuntu.openjdk17
-websphere-liberty:25.0.0.5-full-java8-ibmjava-ubi      ../ga/25.0.0.5/full       ../ga/25.0.0.5/full/Dockerfile.ubi.ibmjava8
-websphere-liberty:25.0.0.5-full-java8-openj9-ubi       ../ga/25.0.0.5/full       ../ga/25.0.0.5/full/Dockerfile.ubi.openjdk8
-websphere-liberty:25.0.0.5-full-java11-openj9-ubi      ../ga/25.0.0.5/full       ../ga/25.0.0.5/full/Dockerfile.ubi.openjdk11
-websphere-liberty:25.0.0.5-full-java17-openj9-ubi      ../ga/25.0.0.5/full       ../ga/25.0.0.5/full/Dockerfile.ubi.openjdk17
-websphere-liberty:beta                        ../beta
-websphere-liberty:test-stock-quote            test-stock-quote
-websphere-liberty:test-stock-trader           test-stock-trader
-websphere-liberty:test-pet-clinic             test-pet-clinic
diff --git a/ga/25.0.0.5/README.md b/ga/25.0.0.6/README.md
similarity index 100%
rename from ga/25.0.0.5/README.md
rename to ga/25.0.0.6/README.md
diff --git a/ga/25.0.0.5/full/Dockerfile.ubi.ibmjava8 b/ga/25.0.0.6/full/Dockerfile.ubi.ibmjava8
similarity index 93%
rename from ga/25.0.0.5/full/Dockerfile.ubi.ibmjava8
rename to ga/25.0.0.6/full/Dockerfile.ubi.ibmjava8
index b21d09c18..880ad2681 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubi.ibmjava8
+++ b/ga/25.0.0.6/full/Dockerfile.ubi.ibmjava8
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java8-ibmjava-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java8-ibmjava-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/25.0.0.5/full/Dockerfile.ubi.openjdk11 b/ga/25.0.0.6/full/Dockerfile.ubi.openjdk11
similarity index 93%
rename from ga/25.0.0.5/full/Dockerfile.ubi.openjdk11
rename to ga/25.0.0.6/full/Dockerfile.ubi.openjdk11
index 5e22bfe6d..b4fb12901 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubi.openjdk11
+++ b/ga/25.0.0.6/full/Dockerfile.ubi.openjdk11
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java11-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java11-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/25.0.0.5/full/Dockerfile.ubi.openjdk17 b/ga/25.0.0.6/full/Dockerfile.ubi.openjdk17
similarity index 93%
rename from ga/25.0.0.5/full/Dockerfile.ubi.openjdk17
rename to ga/25.0.0.6/full/Dockerfile.ubi.openjdk17
index c3c08716c..409efefb5 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubi.openjdk17
+++ b/ga/25.0.0.6/full/Dockerfile.ubi.openjdk17
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java17-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java17-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/25.0.0.5/full/Dockerfile.ubi.openjdk8 b/ga/25.0.0.6/full/Dockerfile.ubi.openjdk8
similarity index 93%
rename from ga/25.0.0.5/full/Dockerfile.ubi.openjdk8
rename to ga/25.0.0.6/full/Dockerfile.ubi.openjdk8
index e9171813d..ba2f51334 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubi.openjdk8
+++ b/ga/25.0.0.6/full/Dockerfile.ubi.openjdk8
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java8-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java8-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/25.0.0.5/full/Dockerfile.ubi9-minimal.ibmjava8 b/ga/25.0.0.6/full/Dockerfile.ubi9-minimal.ibmjava8
similarity index 93%
rename from ga/25.0.0.5/full/Dockerfile.ubi9-minimal.ibmjava8
rename to ga/25.0.0.6/full/Dockerfile.ubi9-minimal.ibmjava8
index d01a002a1..14920722f 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubi9-minimal.ibmjava8
+++ b/ga/25.0.0.6/full/Dockerfile.ubi9-minimal.ibmjava8
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java8-ibmjava-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java8-ibmjava-ubi-minimal
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java8-ibmjava-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java8-ibmjava-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk11 b/ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk11
similarity index 93%
rename from ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk11
rename to ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk11
index c71cf5ed1..f09e73483 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk11
+++ b/ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk11
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java11-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java11-openj9-ubi-minimal
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java11-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java11-openj9-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk17 b/ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk17
similarity index 93%
rename from ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk17
rename to ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk17
index 70ab2c7bc..0d857307e 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk17
+++ b/ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk17
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java17-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java17-openj9-ubi-minimal
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java17-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java17-openj9-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk21 b/ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk21
similarity index 93%
rename from ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk21
rename to ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk21
index f1574d3a3..8073b7656 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk21
+++ b/ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk21
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java21-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java21-openj9-ubi-minimal
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java21-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java21-openj9-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk8 b/ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk8
similarity index 93%
rename from ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk8
rename to ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk8
index ba4ba65ed..cc32ee0b4 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubi9-minimal.openjdk8
+++ b/ga/25.0.0.6/full/Dockerfile.ubi9-minimal.openjdk8
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java8-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java8-openj9-ubi-minimal
 FROM $PARENT_IMAGE AS installBundle
 
 ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.5-kernel-java8-openj9-ubi-minimal
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.6-kernel-java8-openj9-ubi-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/25.0.0.5/full/Dockerfile.ubuntu.ibmjava8 b/ga/25.0.0.6/full/Dockerfile.ubuntu.ibmjava8
similarity index 96%
rename from ga/25.0.0.5/full/Dockerfile.ubuntu.ibmjava8
rename to ga/25.0.0.6/full/Dockerfile.ubuntu.ibmjava8
index d938b29d4..8cd57e8e0 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubuntu.ibmjava8
+++ b/ga/25.0.0.6/full/Dockerfile.ubuntu.ibmjava8
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:25.0.0.5-kernel-java8-ibmjava
+FROM websphere-liberty:25.0.0.6-kernel-java8-ibmjava
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/25.0.0.5/full/Dockerfile.ubuntu.openjdk11 b/ga/25.0.0.6/full/Dockerfile.ubuntu.openjdk11
similarity index 96%
rename from ga/25.0.0.5/full/Dockerfile.ubuntu.openjdk11
rename to ga/25.0.0.6/full/Dockerfile.ubuntu.openjdk11
index 7fe237a8c..53ea738a9 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubuntu.openjdk11
+++ b/ga/25.0.0.6/full/Dockerfile.ubuntu.openjdk11
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:25.0.0.5-kernel-java11-openj9
+FROM websphere-liberty:25.0.0.6-kernel-java11-openj9
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/25.0.0.5/full/Dockerfile.ubuntu.openjdk17 b/ga/25.0.0.6/full/Dockerfile.ubuntu.openjdk17
similarity index 96%
rename from ga/25.0.0.5/full/Dockerfile.ubuntu.openjdk17
rename to ga/25.0.0.6/full/Dockerfile.ubuntu.openjdk17
index dc55ae836..ddc92d1ca 100644
--- a/ga/25.0.0.5/full/Dockerfile.ubuntu.openjdk17
+++ b/ga/25.0.0.6/full/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:25.0.0.5-kernel-java17-openj9
+FROM websphere-liberty:25.0.0.6-kernel-java17-openj9
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/25.0.0.5/full/README.md b/ga/25.0.0.6/full/README.md
similarity index 100%
rename from ga/25.0.0.5/full/README.md
rename to ga/25.0.0.6/full/README.md
diff --git a/ga/25.0.0.5/full/resources/.gitkeep b/ga/25.0.0.6/full/resources/.gitkeep
similarity index 100%
rename from ga/25.0.0.5/full/resources/.gitkeep
rename to ga/25.0.0.6/full/resources/.gitkeep
diff --git a/ga/25.0.0.5/full/server.xml b/ga/25.0.0.6/full/server.xml
similarity index 100%
rename from ga/25.0.0.5/full/server.xml
rename to ga/25.0.0.6/full/server.xml
diff --git a/ga/25.0.0.6/images.txt b/ga/25.0.0.6/images.txt
new file mode 100644
index 000000000..bddfbbf21
--- /dev/null
+++ b/ga/25.0.0.6/images.txt
@@ -0,0 +1,18 @@
+websphere-liberty:25.0.0.6-kernel                      ../ga/25.0.0.6/kernel     ../ga/25.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8
+websphere-liberty:25.0.0.6-kernel-java11-openj9        ../ga/25.0.0.6/kernel     ../ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk11
+websphere-liberty:25.0.0.6-kernel-java17-openj9        ../ga/25.0.0.6/kernel     ../ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk17
+websphere-liberty:25.0.0.6-kernel-java8-ibmjava-ubi    ../ga/25.0.0.6/kernel     ../ga/25.0.0.6/kernel/Dockerfile.ubi.ibmjava8
+websphere-liberty:25.0.0.6-kernel-java8-openj9-ubi     ../ga/25.0.0.6/kernel     ../ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk8
+websphere-liberty:25.0.0.6-kernel-java11-openj9-ubi    ../ga/25.0.0.6/kernel     ../ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk11
+websphere-liberty:25.0.0.6-kernel-java17-openj9-ubi    ../ga/25.0.0.6/kernel     ../ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk17
+websphere-liberty:25.0.0.6-full                        ../ga/25.0.0.6/full       ../ga/25.0.0.6/full/Dockerfile.ubuntu.ibmjava8
+websphere-liberty:25.0.0.6-full-java11-openj9          ../ga/25.0.0.6/full       ../ga/25.0.0.6/full/Dockerfile.ubuntu.openjdk11
+websphere-liberty:25.0.0.6-full-java17-openj9          ../ga/25.0.0.6/full       ../ga/25.0.0.6/full/Dockerfile.ubuntu.openjdk17
+websphere-liberty:25.0.0.6-full-java8-ibmjava-ubi      ../ga/25.0.0.6/full       ../ga/25.0.0.6/full/Dockerfile.ubi.ibmjava8
+websphere-liberty:25.0.0.6-full-java8-openj9-ubi       ../ga/25.0.0.6/full       ../ga/25.0.0.6/full/Dockerfile.ubi.openjdk8
+websphere-liberty:25.0.0.6-full-java11-openj9-ubi      ../ga/25.0.0.6/full       ../ga/25.0.0.6/full/Dockerfile.ubi.openjdk11
+websphere-liberty:25.0.0.6-full-java17-openj9-ubi      ../ga/25.0.0.6/full       ../ga/25.0.0.6/full/Dockerfile.ubi.openjdk17
+websphere-liberty:beta                        ../beta
+websphere-liberty:test-stock-quote            test-stock-quote
+websphere-liberty:test-stock-trader           test-stock-trader
+websphere-liberty:test-pet-clinic             test-pet-clinic
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubi.ibmjava8 b/ga/25.0.0.6/kernel/Dockerfile.ubi.ibmjava8
similarity index 96%
rename from ga/25.0.0.5/kernel/Dockerfile.ubi.ibmjava8
rename to ga/25.0.0.6/kernel/Dockerfile.ubi.ibmjava8
index 030fcf66f..a43c83250 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubi.ibmjava8
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -48,8 +48,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -67,7 +67,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \
       description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk11 b/ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk11
similarity index 96%
rename from ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk11
rename to ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk11
index 8f919920d..d76a05b60 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk11
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 
 # If there is a local copy of the image use that instead
@@ -49,8 +49,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -68,7 +68,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \
       description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk17 b/ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk17
similarity index 96%
rename from ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk17
rename to ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk17
index dbac4169d..ec2494eea 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk17
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -48,8 +48,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -67,7 +67,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \
       description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk8 b/ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk8
similarity index 96%
rename from ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk8
rename to ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk8
index 5acd761be..d9166d846 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubi.openjdk8
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -48,8 +48,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -67,7 +67,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \
       description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.ibmjava8 b/ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.ibmjava8
similarity index 97%
rename from ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.ibmjava8
rename to ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.ibmjava8
index 4e508d1d0..63ece2f61 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.ibmjava8
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.ibmjava8
@@ -29,10 +29,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -59,8 +59,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \
       org.opencontainers.image.vendor="IBM" \
@@ -78,7 +78,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa
       summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 9 minimal" \
       description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 9 minimal as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk11 b/ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk11
similarity index 97%
rename from ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk11
rename to ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk11
index 8bbbdc93b..8974877d8 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk11
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk11
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -47,8 +47,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \
       org.opencontainers.image.vendor="IBM" \
@@ -66,7 +66,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa
       summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal" \
       description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk17 b/ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk17
similarity index 97%
rename from ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk17
rename to ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk17
index b6bdbe77a..a6c3bb083 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk17
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk17
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -47,8 +47,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \
       org.opencontainers.image.vendor="IBM" \
@@ -66,7 +66,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa
       summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal" \
       description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk21
similarity index 97%
rename from ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk21
rename to ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk21
index aa1fa67be..04011f912 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk21
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk21
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -47,8 +47,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -66,7 +66,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal" \
       description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk8 b/ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk8
similarity index 97%
rename from ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk8
rename to ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk8
index 934b37345..166af79ac 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubi9-minimal.openjdk8
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubi9-minimal.openjdk8
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -47,8 +47,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \
       org.opencontainers.image.vendor="IBM" \
@@ -66,7 +66,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa
       summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal" \
       description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/25.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8
similarity index 96%
rename from ga/25.0.0.5/kernel/Dockerfile.ubuntu.ibmjava8
rename to ga/25.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8
index 375986b09..88f1ff678 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -34,7 +34,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       liberty.version="$LIBERTY_VERSION" \
       com.ibm.websphere.liberty.version="$LIBERTY_VERSION"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk11 b/ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk11
similarity index 96%
rename from ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk11
rename to ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk11
index 0c3238ce2..03d479754 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk11
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -34,7 +34,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       liberty.version="$LIBERTY_VERSION" \
       com.ibm.websphere.liberty.version="$LIBERTY_VERSION"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk17 b/ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk17
similarity index 96%
rename from ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk17
rename to ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk17
index 487560212..09d28daca 100644
--- a/ga/25.0.0.5/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/25.0.0.6/kernel/Dockerfile.ubuntu.openjdk17
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -34,7 +34,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       liberty.version="$LIBERTY_VERSION" \
       com.ibm.websphere.liberty.version="$LIBERTY_VERSION"
 
-ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
+ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build:/opt/ibm/helpers/runtime
 
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
diff --git a/ga/25.0.0.5/kernel/NOTICES b/ga/25.0.0.6/kernel/NOTICES
similarity index 100%
rename from ga/25.0.0.5/kernel/NOTICES
rename to ga/25.0.0.6/kernel/NOTICES
diff --git a/ga/25.0.0.5/kernel/README.md b/ga/25.0.0.6/kernel/README.md
similarity index 100%
rename from ga/25.0.0.5/kernel/README.md
rename to ga/25.0.0.6/kernel/README.md
diff --git a/ga/25.0.0.5/kernel/fixes/.gitkeep b/ga/25.0.0.6/kernel/fixes/.gitkeep
similarity index 100%
rename from ga/25.0.0.5/kernel/fixes/.gitkeep
rename to ga/25.0.0.6/kernel/fixes/.gitkeep
diff --git a/ga/25.0.0.5/kernel/helpers/build/checkpoint.sh b/ga/25.0.0.6/kernel/helpers/build/checkpoint.sh
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/checkpoint.sh
rename to ga/25.0.0.6/kernel/helpers/build/checkpoint.sh
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/hazelcast-client.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/http-endpoint.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/jms-endpoint.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/keystore.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/keystore.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/mp-health-check.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/mp-monitoring.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/oidc-config.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/oidc.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/oidc.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sessioncache-features.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-facebook.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-features.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-features.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-github.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-github.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-google.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-google.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-linkedin.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-oauth2.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-oidc.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/sso-twitter.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/tls.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/tls.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/tls.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/trustDefault.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/25.0.0.6/kernel/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configuration_snippets/truststore.xml
rename to ga/25.0.0.6/kernel/helpers/build/configuration_snippets/truststore.xml
diff --git a/ga/25.0.0.5/kernel/helpers/build/configure.sh b/ga/25.0.0.6/kernel/helpers/build/configure.sh
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/configure.sh
rename to ga/25.0.0.6/kernel/helpers/build/configure.sh
diff --git a/ga/25.0.0.5/kernel/helpers/build/features.sh b/ga/25.0.0.6/kernel/helpers/build/features.sh
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/features.sh
rename to ga/25.0.0.6/kernel/helpers/build/features.sh
diff --git a/ga/25.0.0.5/kernel/helpers/build/infinispan-client-setup.sh b/ga/25.0.0.6/kernel/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/infinispan-client-setup.sh
rename to ga/25.0.0.6/kernel/helpers/build/infinispan-client-setup.sh
diff --git a/ga/25.0.0.5/kernel/helpers/build/internal/features-installed.sh b/ga/25.0.0.6/kernel/helpers/build/internal/features-installed.sh
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/internal/features-installed.sh
rename to ga/25.0.0.6/kernel/helpers/build/internal/features-installed.sh
diff --git a/ga/25.0.0.5/kernel/helpers/build/internal/logger.sh b/ga/25.0.0.6/kernel/helpers/build/internal/logger.sh
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/internal/logger.sh
rename to ga/25.0.0.6/kernel/helpers/build/internal/logger.sh
diff --git a/ga/25.0.0.5/kernel/helpers/build/pidplus.sh b/ga/25.0.0.6/kernel/helpers/build/pidplus.sh
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/pidplus.sh
rename to ga/25.0.0.6/kernel/helpers/build/pidplus.sh
diff --git a/ga/25.0.0.5/kernel/helpers/build/populate_scc.sh b/ga/25.0.0.6/kernel/helpers/build/populate_scc.sh
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/build/populate_scc.sh
rename to ga/25.0.0.6/kernel/helpers/build/populate_scc.sh
diff --git a/ga/25.0.0.5/kernel/helpers/runtime/docker-server.sh b/ga/25.0.0.6/kernel/helpers/runtime/docker-server.sh
similarity index 91%
rename from ga/25.0.0.5/kernel/helpers/runtime/docker-server.sh
rename to ga/25.0.0.6/kernel/helpers/runtime/docker-server.sh
index 8df65ef7c..b1217b2e5 100755
--- a/ga/25.0.0.5/kernel/helpers/runtime/docker-server.sh
+++ b/ga/25.0.0.6/kernel/helpers/runtime/docker-server.sh
@@ -26,8 +26,10 @@ function importKeyCert() {
   local KEYSTORE_FILE="/output/resources/security/key.p12"
   local TRUSTSTORE_FILE="/output/resources/security/trust.p12"
 
-  # Import the private key and certificate into new keytore
+  # Import the private key and certificate into new keystore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
+    # Mounted certificates found. Assume the user wants to overwrite any existing keystore
+    # and add these certificates
     echo "Found mounted TLS certificates, generating keystore"
     mkdir -p /output/resources/security
     if [ -f "${CERT_FOLDER}/${CA_FILE}" ]; then
@@ -47,9 +49,9 @@ function importKeyCert() {
         -password pass:"${PASSWORD}" >&/dev/null
     fi
 
-     # Since we are creating new keystore, always write new password to a file
-    sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
-
+    # Since we are creating new keystore, always write new password to a file
+    sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $keystorePathOverride
+    
     # Add mounted CA to the truststore
     if [ -f "${CERT_FOLDER}/${CA_FILE}" ]; then
         echo "Found mounted TLS CA certificate, adding to truststore"
@@ -73,9 +75,9 @@ function importKeyCert() {
     rm -rf /tmp/certs
   fi
 
-  # Add the keystore password to server configuration
-  if [ ! -e $keystorePath ]; then
-    sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
+  # If no keystore has been created, add a keystore password to server configuration
+  if [ ! -e "$keystorePathDefault" ] && [ ! -e "$keystorePathOverride" ]; then
+    sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $keystorePathDefault
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
@@ -107,7 +109,8 @@ SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets
 SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults
 SNIPPETS_TARGET_OVERRIDES=/config/configDropins/overrides
 
-keystorePath="$SNIPPETS_TARGET_DEFAULTS/keystore.xml"
+keystorePathDefault="$SNIPPETS_TARGET_DEFAULTS/keystore.xml"
+keystorePathOverride="$SNIPPETS_TARGET_OVERRIDES/keystore.xml"
 
 importKeyCert
 
diff --git a/ga/25.0.0.6/kernel/helpers/runtime/livenessHealthCheck.sh b/ga/25.0.0.6/kernel/helpers/runtime/livenessHealthCheck.sh
new file mode 100755
index 000000000..bfec3cda3
--- /dev/null
+++ b/ga/25.0.0.6/kernel/helpers/runtime/livenessHealthCheck.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+#Default to Kubernetes default for periodSeconds of 10 seconds
+period_seconds=10
+period_milliseconds=$((period_seconds * 1000))
+
+#Default location for 'live' file - Can change through parameter or server env
+live_file=/output/health/live
+
+
+# Evaluate if there is a env var for periodSeconds
+if [ -n "${LIVENESS_PROBE_PERIOD_SECONDS}" ]
+then
+  #Check input is numerical only
+  if [[ ${LIVENESS_PROBE_PERIOD_SECONDS} =~ ^[0-9]+$ ]]
+  then
+    period_seconds=${LIVENESS_PROBE_PERIOD_SECONDS}
+    period_milliseconds=$((period_seconds * 1000))
+  else
+    echo "Expected only a numerical value for LIVENESS_PROBE_PERIOD_SECONDS environment variable, but recieved: ${LIVENESS_PROBE_PERIOD_SECONDS}. This value will not be used."
+  fi
+fi
+
+# Evaluate if there is a env var for 'live' file location
+if [ -n "${LIVE_FILE_LOCATION}" ]
+then
+  live_file=${LIVE_FILE_LOCATION}
+fi
+
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -p|--period-seconds)
+      #Check input is numerical only
+      if [[ $2 =~ ^[0-9]+$ ]]
+      then
+        period_seconds=$2
+        period_milliseconds=$((period_seconds*1000))
+      else
+        echo "Expected only a numerical value for the -p/--period-seconds parameter, but recieved: $2. Defaulting to 10 second period seconds or environment variable defined value if valid."
+      fi
+      shift
+      shift
+      ;;
+    -f|--file)
+      live_file=$2
+      shift
+      shift
+      ;;
+	--help)
+	  printf "This script is used to query the 'live' health check file to determine if the container is live or not. The default location is '/output/health/live' but can be configured with the '-f' or '--file' option or with the environment variable 'LIVE_FILE_LOCATION' if the file exists in another location. This script will check whether the file has been updated or not within the last 'period seconds' (default is 10 seconds). This value can be configured with the '-p' or '--period-seconds' option or with the 'LIVENESS_PROBE_PERIOD_SECONDS' environment variable. It is important to configure the period seconds option for this script if the Kubernetes 'periodSeconds' field of the liveness probe is configured. Failure to do so will result in misreporting of the liveness status of the container.\n\nNote that the options passed directly in to the script will supersede the environment variable configuration.\n\nUsage: ./livenessHealthCheck.sh <option>...\nOptions:\n\n\t-p/--period-seconds\n\t\t A numerical value that must match the periodSeconds field of the Kubernetes liveness probe configuration. The period seconds value is used by this script to determine if the container is live or not. Default is 10 (seconds).\n\n\t-f/--file\n\t\tThis value is used to inform the script of the location of the 'live' health-check file. The default is '/output/health/live'\n"
+	  exit 1
+	  ;;
+    *)
+     shift
+     ;;
+  esac
+done
+
+cat $live_file
+
+if [ $? -ne 0 ]
+then  
+  exit 1
+fi
+
+#What is the last modified time of the file
+modified_time=$(stat --format=%.3Y $live_file | tr -d ".") 
+
+
+if [ $(expr $(date +%s%3N) - $modified_time) -gt $period_milliseconds ]
+then
+  #File has not been updated within the last period_milliseconds; fail
+  exit 1
+else
+  #File has been updated within the last period_milliseconds; success!
+  exit 0
+fi
diff --git a/ga/25.0.0.6/kernel/helpers/runtime/readinessHealthCheck.sh b/ga/25.0.0.6/kernel/helpers/runtime/readinessHealthCheck.sh
new file mode 100755
index 000000000..7172ce0bc
--- /dev/null
+++ b/ga/25.0.0.6/kernel/helpers/runtime/readinessHealthCheck.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+#Default to Kubernetes default for periodSeconds of 10 seconds
+period_seconds=10
+period_milliseconds=$((period_seconds * 1000))
+
+#Default location for 'ready' file - Can change through parameter or server env
+ready_file=/output/health/ready
+
+
+# Evaluate if there is a env var for periodSeconds
+if [ -n "${READINESS_PROBE_PERIOD_SECONDS}" ]
+then
+  #Check input is numerical only
+  if [[ ${READINESS_PROBE_PERIOD_SECONDS} =~ ^[0-9]+$ ]]
+  then
+    period_seconds=${READINESS_PROBE_PERIOD_SECONDS}
+    period_milliseconds=$((period_seconds * 1000))
+  else
+    echo "Expected only a numerical value for READINESS_PROBE_PERIOD_SECONDS environment variable, but recieved: ${READINESS_PROBE_PERIOD_SECONDS}. This value will not be used."
+  fi
+fi
+
+# Evaluate if there is a env var for 'ready' file location
+if [ -n "${READY_FILE_LOCATION}" ]
+then
+  ready_file=${READY_FILE_LOCATION}
+fi
+
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -p|--period-seconds)
+      #Check input is numerical only
+      if [[ $2 =~ ^[0-9]+$ ]]
+      then
+        period_seconds=$2
+        period_milliseconds=$((period_seconds*1000))
+      else
+        echo "Expected only a numerical value for the -p/--period-seconds parameter, but recieved: $2. Defaulting to 10 second period seconds or environment variable defined value if valid."
+      fi
+      shift
+      shift
+      ;;
+    -f|--file)
+      ready_file=$2
+      shift
+      shift
+      ;;
+	--help)
+	  printf "This script is used to query the 'ready' health check file to determine if the container is ready or not. The default location is '/output/health/ready' but can be configured with the '-f' or '--file' option or with the environment variable 'READY_FILE_LOCATION' if the file exists in another location. This script will check whether the file has been updated or not within the last 'period seconds' (default is 10 seconds). This value can be configured with the '-p' or '--period-seconds' option or with the 'READINESS_PROBE_PERIOD_SECONDS' environment variable. It is important to configure the period seconds option for this script if the Kubernetes 'periodSeconds' field of the readiness probe is configured. Failure to do so will result in misreporting of the readiness status of the container.\n\nNote that the options passed directly in to the script will supersede the environment variable configuration.\n\nUsage: ./readinessHealthCheck.sh <option>...\nOptions:\n\n\t-p/--period-seconds\n\t\t A numerical value that must match the periodSeconds field of the Kubernetes readiness probe configuration. The period seconds value is used by this script to determine if the container is ready or not. Default is 10 (seconds).\n\n\t-f/--file\n\t\tThis value is used to inform the script of the location of the 'ready' health-check file. The default is '/output/health/ready'\n"
+	  exit 1
+	  ;;
+    *)
+     shift
+     ;;
+  esac
+done
+
+cat $ready_file
+
+if [ $? -ne 0 ]
+then  
+  exit 1
+fi
+
+#What is the last modified time of the file
+modified_time=$(stat --format=%.3Y $ready_file | tr -d ".") 
+
+
+if [ $(expr $(date +%s%3N) - $modified_time) -gt $period_milliseconds ]
+then
+  #File has not been updated within the last period_milliseconds; fail
+  exit 1
+else
+  #File has been updated within the last period_milliseconds; success!
+  exit 0
+fi
diff --git a/ga/25.0.0.5/kernel/helpers/runtime/restore-server.sh b/ga/25.0.0.6/kernel/helpers/runtime/restore-server.sh
similarity index 100%
rename from ga/25.0.0.5/kernel/helpers/runtime/restore-server.sh
rename to ga/25.0.0.6/kernel/helpers/runtime/restore-server.sh
diff --git a/ga/25.0.0.6/kernel/helpers/runtime/startupHealthCheck.sh b/ga/25.0.0.6/kernel/helpers/runtime/startupHealthCheck.sh
new file mode 100755
index 000000000..20ffeec4f
--- /dev/null
+++ b/ga/25.0.0.6/kernel/helpers/runtime/startupHealthCheck.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+#Default to 1s - Can change through parameter or server env
+timeout_seconds=1
+timeout_milliseconds=$((timeout_seconds * 1000))
+
+#Default location for 'started' file - Can change through parameter or server env
+started_file=/output/health/started
+
+#Static values - will not be changed
+sleep_seconds=0.01
+sleep_milliseconds=10
+
+
+# Evaluate if there is a env var for timeoutSeconds
+if [ -n "${STARTUP_PROBE_TIMEOUT_SECONDS}" ]
+then
+  #Check input is numerical only
+  if [[ ${STARTUP_PROBE_TIMEOUT_SECONDS} =~ ^[0-9]+$ ]]
+  then
+    timeout_seconds=${STARTUP_PROBE_TIMEOUT_SECONDS}
+    timeout_milliseconds=$((timeout_seconds * 1000))
+  else
+    echo "Expected only a numerical value for STARTUP_PROBE_TIMEOUT_SECONDS environment variable, but recieved: ${STARTUP_PROBE_TIMEOUT_SECONDS}. This value will not be used."
+  fi
+fi
+
+# Evaluate if there is a env var for 'started' file location
+if [ -n "${STARTED_FILE_LOCATION}" ]
+then
+  started_file=${STARTED_FILE_LOCATION}
+fi
+
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -t|--timeout-seconds)
+      #Check input is numerical only
+      if [[ $2 =~ ^[0-9]+$ ]]
+      then
+        timeout_seconds=$2
+        timeout_milliseconds=$((timeout_seconds*1000))
+      else
+        echo "Expected only a numerical value for the -t/--timeout-seconds parameter, but recieved: $2. Defaulting to 1 second timeoutSeconds or environment variable defined value if valid."
+      fi
+      shift
+      shift
+      ;;
+    -f|--file)
+      started_file=$2
+      shift
+      shift
+      ;;
+	--help)
+	  printf "This script is used to query the 'started' health check file to determine if the container is started. The default location is '/output/health/started' but can be configured with the '-f' or '--file' option or the environment variable 'STARTED_FILE_LOCATION' if the file exists in another location. This script will check until the timeout duration has expired (default is 1 second) unless configured otherwise. Configuring the timeout option for this script is important if the 'timeoutSeconds' field of the Kubernetes startup probe is configured. This can be achieved by using the '-t' or '--timeout-seconds' option or with the environment variable 'STARTUP_PROBE_TIMEOUT_SECONDS'. Failure to do so will result in the script not being able to capture a successful startup response as soon as possible.\n\nNote that the options passed directly into the script will supersede the environment variable configuration.\n\nUsage: ./startupHealthCheck.sh <option>...\nOptions:\n\n\t-t/--timeout-seconds\n\t\t A numerical value that must match the 'timeoutSeconds' field of the Kubernetes startup probe configuration. The timeout value is used by this script to establish a timeout duration. Defaults to 1 (second).\n\n\t-f/--file\n\t\tThis value is used to inform the script of the location of the 'started' health-check file. The default is '/output/health/started'\n"
+	  exit 1
+	  ;;
+    *)
+     shift
+     ;;
+  esac
+done
+
+countdown=$timeout_milliseconds
+while [ $countdown -gt 0 ]
+do
+  cat ${started_file}
+  #Succesful `cat`, return 0
+  if [ $? -eq 0 ]
+  then
+    # Delete file before returning 0. Avoid issues where image/pod crashes and /output is a PV. 
+	# This would lead to a pre-existing file when pod is restarted
+    rm ${started_file}
+    exit 0
+  fi
+  sleep ${sleep_seconds}
+  countdown=$((countdown - sleep_milliseconds))
+done
+
+#Default to 1 if we never achieved succesful check.
+exit 1
\ No newline at end of file
diff --git a/ga/25.0.0.5/kernel/resources/.gitkeep b/ga/25.0.0.6/kernel/resources/.gitkeep
similarity index 100%
rename from ga/25.0.0.5/kernel/resources/.gitkeep
rename to ga/25.0.0.6/kernel/resources/.gitkeep
diff --git a/ga/25.0.0.5/oidcProvider/Dockerfile b/ga/25.0.0.6/oidcProvider/Dockerfile
similarity index 100%
rename from ga/25.0.0.5/oidcProvider/Dockerfile
rename to ga/25.0.0.6/oidcProvider/Dockerfile
diff --git a/ga/25.0.0.5/oidcProvider/Dockerfile.java11 b/ga/25.0.0.6/oidcProvider/Dockerfile.java11
similarity index 100%
rename from ga/25.0.0.5/oidcProvider/Dockerfile.java11
rename to ga/25.0.0.6/oidcProvider/Dockerfile.java11
diff --git a/ga/25.0.0.5/oidcProvider/README.md b/ga/25.0.0.6/oidcProvider/README.md
similarity index 100%
rename from ga/25.0.0.5/oidcProvider/README.md
rename to ga/25.0.0.6/oidcProvider/README.md
diff --git a/ga/25.0.0.5/oidcProvider/server.xml b/ga/25.0.0.6/oidcProvider/server.xml
similarity index 100%
rename from ga/25.0.0.5/oidcProvider/server.xml
rename to ga/25.0.0.6/oidcProvider/server.xml
diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
index e44df7cdd..a43c83250 100644
--- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -48,8 +48,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
index 4a610ddff..d76a05b60 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 
 # If there is a local copy of the image use that instead
@@ -49,8 +49,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index 268f28ba5..ec2494eea 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -48,8 +48,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
index 0d594bafe..d9166d846 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -48,8 +48,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
index 5e956e060..63ece2f61 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8
@@ -29,10 +29,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -59,8 +59,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
index 8a416524b..8974877d8 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -47,8 +47,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
index ab78311b7..a6c3bb083 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -47,8 +47,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
index 52c7589c8..04011f912 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -47,8 +47,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
index 795dc9e99..166af79ac 100644
--- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8
@@ -19,10 +19,10 @@ USER root
 ARG VERBOSE=false
 
 # Install WebSphere Liberty
-ARG LIBERTY_VERSION=25.0.0.5
+ARG LIBERTY_VERSION=25.0.0.6
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 # If there is a local copy of the image use that instead
 COPY resources/ /tmp/
@@ -47,8 +47,8 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Iain Lewis, Melissa Lee, Kirby Chin" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
index 33857fa48..88f1ff678 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index 33a634610..03d479754 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index 567e7abba..09d28daca 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.5
-ARG LIBERTY_BUILD_LABEL=cl250520250504-1901
-ARG LIBERTY_SHA=2acea83026ce278918fe4a2ee8f1565708f3bc3a
+ARG LIBERTY_VERSION=25.0.0.6
+ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
+ARG LIBERTY_SHA=1401b726aa535431ef9166b859757498f51851d6
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \