Skip to content

Updates for the release of WebSphere and Open Liberty 25.0.0.10 #20064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Oct 16, 2025
Merged

Updates for the release of WebSphere and Open Liberty 25.0.0.10 #20064

merged 2 commits into from
Oct 16, 2025

Conversation

gkertasef
Copy link
Contributor

No description provided.

@gkertasef gkertasef requested a review from a team as a code owner October 9, 2025 14:59
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@tianon
Copy link
Member

tianon commented Oct 9, 2025

Looks like builds are probably failing due to LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} failing - it would be really helpful if that value could be pre-calculated and embedded in the Dockerfile directly instead of calculated during build (for many reasons, the current obscure build failure being just one).

@yosifkit
Copy link
Member

yosifkit commented Oct 9, 2025

Ah, I think the removal of .3 images was missed when .9 was added (#19857) since that is what normally happens on the PRs for the quarterly (3/6/9/12) releases.

@leochr
Copy link
Contributor

leochr commented Oct 9, 2025

Thank you for investigating the failure.

We have a new requirement to support quarterly releases longer starting with 25.0.0.3, which is the reason 25.0.0.3 wasn't removed when 25.0.0.9 was added. But as evident from the error seen in the build, that's currently not possible. The index file/DHE repo need to change. To unblock the critical 25.0.0.10 release, I suggest that we remove 25.0.0.3 references as part of this PR and handle that separately in a different PR (once index file/DHE is sorted out).

@gkertasef @wraschke Could you please add a commit to remove 25.0.0.3 for now? Thank you.

@gkertasef
Copy link
Contributor Author

I have removed 25.0.0.3 images.

@github-actions GitHub Actions
Copy link

Diff for ba80571: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 833a4da..d9cd06f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,37 +3,7 @@ Maintainers: Gkerta Seferi <[email protected]> (@gkertasef), Leo Christy Jes
 Architectures: amd64, i386, ppc64le, s390x
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
 GitFetch: refs/heads/main
-GitCommit: df1008db2a5d520f005f134e94438cf7940fc537
-
-Tags: 25.0.0.3-full-java8-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-Directory: releases/25.0.0.3/full
-File: Dockerfile.ubuntu.openjdk8
-
-Tags: 25.0.0.3-full-java11-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-Directory: releases/25.0.0.3/full
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 25.0.0.3-full-java17-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-Directory: releases/25.0.0.3/full
-File: Dockerfile.ubuntu.openjdk17
-
-Tags: 25.0.0.3-kernel-slim-java8-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-Directory: releases/25.0.0.3/kernel-slim
-File: Dockerfile.ubuntu.openjdk8
-
-Tags: 25.0.0.3-kernel-slim-java11-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-Directory: releases/25.0.0.3/kernel-slim
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 25.0.0.3-kernel-slim-java17-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-Directory: releases/25.0.0.3/kernel-slim
-File: Dockerfile.ubuntu.openjdk17
+GitCommit: 95b408ba6272ada9708d6bf6b1ddffc5dbbbdb7d
 
 Tags: 25.0.0.6-full-java8-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
@@ -95,6 +65,36 @@ Architectures: amd64, arm64v8, ppc64le, s390x
 Directory: releases/25.0.0.9/kernel-slim
 File: Dockerfile.ubuntu.openjdk17
 
+Tags: 25.0.0.10-full-java8-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+Directory: releases/25.0.0.10/full
+File: Dockerfile.ubuntu.openjdk8
+
+Tags: 25.0.0.10-full-java11-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+Directory: releases/25.0.0.10/full
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 25.0.0.10-full-java17-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+Directory: releases/25.0.0.10/full
+File: Dockerfile.ubuntu.openjdk17
+
+Tags: 25.0.0.10-kernel-slim-java8-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+Directory: releases/25.0.0.10/kernel-slim
+File: Dockerfile.ubuntu.openjdk8
+
+Tags: 25.0.0.10-kernel-slim-java11-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+Directory: releases/25.0.0.10/kernel-slim
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 25.0.0.10-kernel-slim-java17-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+Directory: releases/25.0.0.10/kernel-slim
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: beta
 Architectures: amd64, arm64v8, ppc64le, s390x
 Directory: releases/latest/beta
@@ -146,35 +146,7 @@ Maintainers: Gkerta Seferi <[email protected]> (@gkertasef), Leo Christy Jes
 Architectures: amd64, ppc64le, s390x
 GitRepo: https://github.com/WASdev/ci.docker.git
 GitFetch: refs/heads/main
-GitCommit: 607823a671a48dc60ed9d287b50898c38df6fd92
-
-Tags: 25.0.0.3-full-java8-ibmjava
-Directory: ga/25.0.0.3/full
-File: Dockerfile.ubuntu.ibmjava8
-
-Tags: 25.0.0.3-full-java11-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-Directory: ga/25.0.0.3/full
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 25.0.0.3-full-java17-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-Directory: ga/25.0.0.3/full
-File: Dockerfile.ubuntu.openjdk17
-
-Tags: 25.0.0.3-kernel-java8-ibmjava
-Directory: ga/25.0.0.3/kernel
-File: Dockerfile.ubuntu.ibmjava8
-
-Tags: 25.0.0.3-kernel-java11-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-Directory: ga/25.0.0.3/kernel
-File: Dockerfile.ubuntu.openjdk11
-
-Tags: 25.0.0.3-kernel-java17-openj9
-Architectures: amd64, arm64v8, ppc64le, s390x
-Directory: ga/25.0.0.3/kernel
-File: Dockerfile.ubuntu.openjdk17
+GitCommit: 2cec7543350cb079a15d3a9cc09f4025a8512add
 
 Tags: 25.0.0.6-full-java8-ibmjava
 Directory: ga/25.0.0.6/full
@@ -232,6 +204,34 @@ Architectures: amd64, arm64v8, ppc64le, s390x
 Directory: ga/25.0.0.9/kernel
 File: Dockerfile.ubuntu.openjdk17
 
+Tags: 25.0.0.10-full-java8-ibmjava
+Directory: ga/25.0.0.10/full
+File: Dockerfile.ubuntu.ibmjava8
+
+Tags: 25.0.0.10-full-java11-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+Directory: ga/25.0.0.10/full
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 25.0.0.10-full-java17-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+Directory: ga/25.0.0.10/full
+File: Dockerfile.ubuntu.openjdk17
+
+Tags: 25.0.0.10-kernel-java8-ibmjava
+Directory: ga/25.0.0.10/kernel
+File: Dockerfile.ubuntu.ibmjava8
+
+Tags: 25.0.0.10-kernel-java11-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+Directory: ga/25.0.0.10/kernel
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 25.0.0.10-kernel-java17-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+Directory: ga/25.0.0.10/kernel
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: full, latest, full-java8-ibmjava
 Directory: ga/latest/full
 File: Dockerfile.ubuntu.ibmjava8
diff --git a/_bashbrew-list b/_bashbrew-list
index aeda8f7..763e72c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,3 @@
-open-liberty:25.0.0.3-full-java8-openj9
-open-liberty:25.0.0.3-full-java11-openj9
-open-liberty:25.0.0.3-full-java17-openj9
-open-liberty:25.0.0.3-kernel-slim-java8-openj9
-open-liberty:25.0.0.3-kernel-slim-java11-openj9
-open-liberty:25.0.0.3-kernel-slim-java17-openj9
 open-liberty:25.0.0.6-full-java8-openj9
 open-liberty:25.0.0.6-full-java11-openj9
 open-liberty:25.0.0.6-full-java17-openj9
@@ -16,6 +10,12 @@ open-liberty:25.0.0.9-full-java17-openj9
 open-liberty:25.0.0.9-kernel-slim-java8-openj9
 open-liberty:25.0.0.9-kernel-slim-java11-openj9
 open-liberty:25.0.0.9-kernel-slim-java17-openj9
+open-liberty:25.0.0.10-full-java8-openj9
+open-liberty:25.0.0.10-full-java11-openj9
+open-liberty:25.0.0.10-full-java17-openj9
+open-liberty:25.0.0.10-kernel-slim-java8-openj9
+open-liberty:25.0.0.10-kernel-slim-java11-openj9
+open-liberty:25.0.0.10-kernel-slim-java17-openj9
 open-liberty:beta
 open-liberty:beta-java11
 open-liberty:beta-java17
@@ -28,12 +28,6 @@ open-liberty:kernel-slim-java8-openj9
 open-liberty:kernel-slim-java11-openj9
 open-liberty:kernel-slim-java17-openj9
 open-liberty:latest
-websphere-liberty:25.0.0.3-full-java8-ibmjava
-websphere-liberty:25.0.0.3-full-java11-openj9
-websphere-liberty:25.0.0.3-full-java17-openj9
-websphere-liberty:25.0.0.3-kernel-java8-ibmjava
-websphere-liberty:25.0.0.3-kernel-java11-openj9
-websphere-liberty:25.0.0.3-kernel-java17-openj9
 websphere-liberty:25.0.0.6-full-java8-ibmjava
 websphere-liberty:25.0.0.6-full-java11-openj9
 websphere-liberty:25.0.0.6-full-java17-openj9
@@ -46,6 +40,12 @@ websphere-liberty:25.0.0.9-full-java17-openj9
 websphere-liberty:25.0.0.9-kernel-java8-ibmjava
 websphere-liberty:25.0.0.9-kernel-java11-openj9
 websphere-liberty:25.0.0.9-kernel-java17-openj9
+websphere-liberty:25.0.0.10-full-java8-ibmjava
+websphere-liberty:25.0.0.10-full-java11-openj9
+websphere-liberty:25.0.0.10-full-java17-openj9
+websphere-liberty:25.0.0.10-kernel-java8-ibmjava
+websphere-liberty:25.0.0.10-kernel-java11-openj9
+websphere-liberty:25.0.0.10-kernel-java17-openj9
 websphere-liberty:full
 websphere-liberty:full-java8-ibmjava
 websphere-liberty:full-java11-openj9
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index f6ca6d0..4552b5b 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,3 @@
-open-liberty:25.0.0.3-full-java8-openj9
-open-liberty:25.0.0.3-full-java11-openj9
-open-liberty:25.0.0.3-full-java17-openj9
-open-liberty:25.0.0.3-kernel-slim-java8-openj9
-open-liberty:25.0.0.3-kernel-slim-java11-openj9
-open-liberty:25.0.0.3-kernel-slim-java17-openj9
 open-liberty:25.0.0.6-full-java8-openj9
 open-liberty:25.0.0.6-full-java11-openj9
 open-liberty:25.0.0.6-full-java17-openj9
@@ -16,6 +10,12 @@ open-liberty:25.0.0.9-full-java17-openj9
 open-liberty:25.0.0.9-kernel-slim-java8-openj9
 open-liberty:25.0.0.9-kernel-slim-java11-openj9
 open-liberty:25.0.0.9-kernel-slim-java17-openj9
+open-liberty:25.0.0.10-full-java8-openj9
+open-liberty:25.0.0.10-full-java11-openj9
+open-liberty:25.0.0.10-full-java17-openj9
+open-liberty:25.0.0.10-kernel-slim-java8-openj9
+open-liberty:25.0.0.10-kernel-slim-java11-openj9
+open-liberty:25.0.0.10-kernel-slim-java17-openj9
 open-liberty:beta
 open-liberty:beta-java11
 open-liberty:beta-java17
@@ -25,27 +25,27 @@ open-liberty:kernel-slim-java8-openj9
 open-liberty:kernel-slim-java11-openj9
 open-liberty:kernel-slim-java17-openj9
 open-liberty:latest
-websphere-liberty:25.0.0.3-kernel-java8-ibmjava
-websphere-liberty:25.0.0.3-kernel-java11-openj9
-websphere-liberty:25.0.0.3-kernel-java17-openj9
 websphere-liberty:25.0.0.6-kernel-java8-ibmjava
 websphere-liberty:25.0.0.6-kernel-java11-openj9
 websphere-liberty:25.0.0.6-kernel-java17-openj9
 websphere-liberty:25.0.0.9-kernel-java8-ibmjava
 websphere-liberty:25.0.0.9-kernel-java11-openj9
 websphere-liberty:25.0.0.9-kernel-java17-openj9
+websphere-liberty:25.0.0.10-kernel-java8-ibmjava
+websphere-liberty:25.0.0.10-kernel-java11-openj9
+websphere-liberty:25.0.0.10-kernel-java17-openj9
 websphere-liberty:kernel-java8-ibmjava
 websphere-liberty:kernel-java11-openj9
 websphere-liberty:kernel-java17-openj9
-websphere-liberty:25.0.0.3-full-java8-ibmjava
-websphere-liberty:25.0.0.3-full-java11-openj9
-websphere-liberty:25.0.0.3-full-java17-openj9
 websphere-liberty:25.0.0.6-full-java8-ibmjava
 websphere-liberty:25.0.0.6-full-java11-openj9
 websphere-liberty:25.0.0.6-full-java17-openj9
 websphere-liberty:25.0.0.9-full-java8-ibmjava
 websphere-liberty:25.0.0.9-full-java11-openj9
 websphere-liberty:25.0.0.9-full-java17-openj9
+websphere-liberty:25.0.0.10-full-java8-ibmjava
+websphere-liberty:25.0.0.10-full-java11-openj9
+websphere-liberty:25.0.0.10-full-java17-openj9
 websphere-liberty:full-java8-ibmjava
 websphere-liberty:full-java11-openj9
 websphere-liberty:full-java17-openj9
diff --git a/open-liberty_25.0.0.9-full-java11-openj9/Dockerfile.ubuntu.openjdk11 b/open-liberty_25.0.0.10-full-java11-openj9/Dockerfile.ubuntu.openjdk11
similarity index 94%
copy from open-liberty_25.0.0.9-full-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to open-liberty_25.0.0.10-full-java11-openj9/Dockerfile.ubuntu.openjdk11
index 5dbb166..102268c 100644
--- a/open-liberty_25.0.0.9-full-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/open-liberty_25.0.0.10-full-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-11-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_SHA=951b549b9f2bf42e9ddf753a089524d2e4d24276
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=728ce77fbfbaebb26fa857db332ad03241a0d52d
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -99,8 +101,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +112,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/NOTICES b/open-liberty_25.0.0.10-full-java11-openj9/NOTICES
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/NOTICES
rename to open-liberty_25.0.0.10-full-java11-openj9/NOTICES
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/fixes/.gitkeep b/open-liberty_25.0.0.10-full-java11-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/fixes/.gitkeep
rename to open-liberty_25.0.0.10-full-java11-openj9/fixes/.gitkeep
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/checkpoint.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/checkpoint.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/checkpoint.sh
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/checkpoint.sh
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configure.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configure.sh
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/configure.sh
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/internal/logger.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/internal/logger.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/internal/logger.sh
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/internal/logger.sh
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/pidplus.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/pidplus.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/pidplus.sh
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/pidplus.sh
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/build/populate_scc.sh
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/docker-server.sh
similarity index 94%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
copy to open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
copy to open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/runtime/restore-server.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/restore-server.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java11-openj9/helpers/runtime/restore-server.sh
rename to open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/restore-server.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh b/open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
copy to open-liberty_25.0.0.10-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-full-java17-openj9/Dockerfile.ubuntu.openjdk17 b/open-liberty_25.0.0.10-full-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 94%
copy from open-liberty_25.0.0.6-full-java17-openj9/Dockerfile.ubuntu.openjdk17
copy to open-liberty_25.0.0.10-full-java17-openj9/Dockerfile.ubuntu.openjdk17
index 6f47676..f14a537 100644
--- a/open-liberty_25.0.0.6-full-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/open-liberty_25.0.0.10-full-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-17-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.6
-ARG LIBERTY_SHA=a26724573f5c4f04fb9a39706a715e6bb85490c6
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=728ce77fbfbaebb26fa857db332ad03241a0d52d
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -99,8 +101,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +112,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/NOTICES b/open-liberty_25.0.0.10-full-java17-openj9/NOTICES
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/NOTICES
rename to open-liberty_25.0.0.10-full-java17-openj9/NOTICES
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/fixes/.gitkeep b/open-liberty_25.0.0.10-full-java17-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/fixes/.gitkeep
rename to open-liberty_25.0.0.10-full-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/checkpoint.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/checkpoint.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/checkpoint.sh
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/checkpoint.sh
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configure.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configure.sh
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/configure.sh
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/internal/logger.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/internal/logger.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/internal/logger.sh
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/internal/logger.sh
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/pidplus.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/pidplus.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/pidplus.sh
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/pidplus.sh
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/populate_scc.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/build/populate_scc.sh
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/docker-server.sh
similarity index 94%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/livenessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
copy to open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/livenessHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/readinessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
copy to open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/readinessHealthCheck.sh
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/runtime/restore-server.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/restore-server.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java17-openj9/helpers/runtime/restore-server.sh
rename to open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/restore-server.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh b/open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/startupHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
copy to open-liberty_25.0.0.10-full-java17-openj9/helpers/runtime/startupHealthCheck.sh
diff --git a/open-liberty_25.0.0.9-full-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_25.0.0.10-full-java8-openj9/Dockerfile.ubuntu.openjdk8
similarity index 94%
copy from open-liberty_25.0.0.9-full-java8-openj9/Dockerfile.ubuntu.openjdk8
copy to open-liberty_25.0.0.10-full-java8-openj9/Dockerfile.ubuntu.openjdk8
index 0ca25da..70dfc0c 100644
--- a/open-liberty_25.0.0.9-full-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_25.0.0.10-full-java8-openj9/Dockerfile.ubuntu.openjdk8
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-8-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_SHA=951b549b9f2bf42e9ddf753a089524d2e4d24276
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=728ce77fbfbaebb26fa857db332ad03241a0d52d
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -99,8 +101,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +112,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/NOTICES b/open-liberty_25.0.0.10-full-java8-openj9/NOTICES
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/NOTICES
rename to open-liberty_25.0.0.10-full-java8-openj9/NOTICES
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/fixes/.gitkeep b/open-liberty_25.0.0.10-full-java8-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/fixes/.gitkeep
rename to open-liberty_25.0.0.10-full-java8-openj9/fixes/.gitkeep
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/checkpoint.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/checkpoint.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/checkpoint.sh
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/checkpoint.sh
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configure.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configure.sh
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/configure.sh
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/internal/logger.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/internal/logger.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/internal/logger.sh
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/internal/logger.sh
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/pidplus.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/pidplus.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/pidplus.sh
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/pidplus.sh
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/populate_scc.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/build/populate_scc.sh
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/docker-server.sh
similarity index 94%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/livenessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
copy to open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/livenessHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/readinessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
copy to open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/readinessHealthCheck.sh
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/runtime/restore-server.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/restore-server.sh
similarity index 100%
rename from open-liberty_25.0.0.3-full-java8-openj9/helpers/runtime/restore-server.sh
rename to open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/restore-server.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh b/open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/startupHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
copy to open-liberty_25.0.0.10-full-java8-openj9/helpers/runtime/startupHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11 b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
similarity index 94%
copy from open-liberty_25.0.0.6-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to open-liberty_25.0.0.10-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
index 427e54b..62df0cf 100644
--- a/open-liberty_25.0.0.6-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-11-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.6
-ARG LIBERTY_SHA=de41ad8ec018c12178e4339908626bcc6b89fdaa
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=78dfbddacc7efe6b203fbe34558357002447a9ca
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250620250602-1102
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -97,8 +99,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -110,7 +110,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/NOTICES b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/NOTICES
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/NOTICES
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/NOTICES
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/fixes/.gitkeep b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/fixes/.gitkeep
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/fixes/.gitkeep
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/checkpoint.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/checkpoint.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/checkpoint.sh
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/checkpoint.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configure.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configure.sh
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/configure.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/features.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/features.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/features.sh
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/features.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/internal/logger.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/internal/logger.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/internal/logger.sh
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/internal/logger.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/pidplus.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/pidplus.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/pidplus.sh
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/pidplus.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
similarity index 94%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/livenessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
copy to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/livenessHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/readinessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
copy to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/readinessHealthCheck.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/runtime/restore-server.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/restore-server.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/runtime/restore-server.sh
rename to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/restore-server.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh b/open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/startupHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
copy to open-liberty_25.0.0.10-kernel-slim-java11-openj9/helpers/runtime/startupHealthCheck.sh
diff --git a/open-liberty_25.0.0.9-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17 b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 94%
copy from open-liberty_25.0.0.9-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
copy to open-liberty_25.0.0.10-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
index 5228bef..0c0a696 100644
--- a/open-liberty_25.0.0.9-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-17-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_SHA=21343f004335a93e1ca93d8b42d0243c860b01d0
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=78dfbddacc7efe6b203fbe34558357002447a9ca
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -97,8 +99,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -110,7 +110,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/NOTICES b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/NOTICES
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/NOTICES
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/NOTICES
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/fixes/.gitkeep b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/fixes/.gitkeep
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/checkpoint.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/checkpoint.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/checkpoint.sh
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/checkpoint.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configure.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configure.sh
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/configure.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/features.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/features.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/features.sh
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/features.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/internal/logger.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/internal/logger.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/internal/logger.sh
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/internal/logger.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/pidplus.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/pidplus.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/pidplus.sh
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/pidplus.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/populate_scc.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/populate_scc.sh
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
similarity index 94%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/livenessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
copy to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/livenessHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/readinessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
copy to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/readinessHealthCheck.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/runtime/restore-server.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/restore-server.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/runtime/restore-server.sh
rename to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/restore-server.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh b/open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/startupHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
copy to open-liberty_25.0.0.10-kernel-slim-java17-openj9/helpers/runtime/startupHealthCheck.sh
diff --git a/open-liberty_25.0.0.9-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
similarity index 94%
copy from open-liberty_25.0.0.9-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
copy to open-liberty_25.0.0.10-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
index 5bbfcf9..dec6cc2 100644
--- a/open-liberty_25.0.0.9-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-8-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_SHA=21343f004335a93e1ca93d8b42d0243c860b01d0
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=78dfbddacc7efe6b203fbe34558357002447a9ca
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -97,8 +99,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -110,7 +110,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/NOTICES b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/NOTICES
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/NOTICES
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/NOTICES
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/fixes/.gitkeep b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/fixes/.gitkeep
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/fixes/.gitkeep
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/checkpoint.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/checkpoint.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/checkpoint.sh
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/checkpoint.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configure.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configure.sh
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/configure.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/features.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/features.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/features.sh
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/features.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/internal/logger.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/internal/logger.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/internal/logger.sh
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/internal/logger.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/pidplus.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/pidplus.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/pidplus.sh
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/pidplus.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/populate_scc.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
similarity index 94%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/livenessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
copy to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/livenessHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/readinessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
copy to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/readinessHealthCheck.sh
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/runtime/restore-server.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/restore-server.sh
similarity index 100%
rename from open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/runtime/restore-server.sh
rename to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/restore-server.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh b/open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/startupHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
copy to open-liberty_25.0.0.10-kernel-slim-java8-openj9/helpers/runtime/startupHealthCheck.sh
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/Dockerfile.ubuntu.openjdk11 b/open-liberty_25.0.0.3-full-java11-openj9/Dockerfile.ubuntu.openjdk11
deleted file mode 100644
index f5517c3..0000000
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/open-liberty_25.0.0.3-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.3-full-java11-openj9/helpers/runtime/docker-server.sh
deleted file mode 100755
index 4c36a2e..0000000
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/Dockerfile.ubuntu.openjdk17 b/open-liberty_25.0.0.3-full-java17-openj9/Dockerfile.ubuntu.openjdk17
deleted file mode 100644
index 66f328a..0000000
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.3-full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/open-liberty_25.0.0.3-full-java17-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.3-full-java17-openj9/helpers/runtime/docker-server.sh
deleted file mode 100755
index 4c36a2e..0000000
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_25.0.0.3-full-java8-openj9/Dockerfile.ubuntu.openjdk8
deleted file mode 100644
index e5d985a..0000000
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/open-liberty_25.0.0.3-full-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.3-full-java8-openj9/helpers/runtime/docker-server.sh
deleted file mode 100755
index 4c36a2e..0000000
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11 b/open-liberty_25.0.0.3-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
deleted file mode 100644
index 534f119..0000000
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.3-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
deleted file mode 100755
index 4c36a2e..0000000
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17 b/open-liberty_25.0.0.3-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
deleted file mode 100644
index b970777..0000000
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.3-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
deleted file mode 100755
index 4c36a2e..0000000
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_25.0.0.3-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
deleted file mode 100644
index 1fe1a22..0000000
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_25.0.0.3-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
deleted file mode 100755
index 4c36a2e..0000000
diff --git a/open-liberty_beta-java11/Dockerfile.ubuntu.openjdk11 b/open-liberty_beta-java11/Dockerfile.ubuntu.openjdk11
index 7a859eb..2c669f4 100644
--- a/open-liberty_beta-java11/Dockerfile.ubuntu.openjdk11
+++ b/open-liberty_beta-java11/Dockerfile.ubuntu.openjdk11
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-11-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.10-beta
-ARG LIBERTY_SHA=5270541e71c1d4517457931fd1be3a234d1a1ad5
+ARG LIBERTY_VERSION=25.0.0.11-beta
+ARG LIBERTY_SHA=ad751b0af9e656d1bb9e477d01b63ae8faa60908
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/beta/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -99,8 +101,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +112,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml   
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_beta-java11/helpers/runtime/docker-server.sh b/open-liberty_beta-java11/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_beta-java11/helpers/runtime/docker-server.sh
+++ b/open-liberty_beta-java11/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_beta-java17/Dockerfile.ubuntu.openjdk17 b/open-liberty_beta-java17/Dockerfile.ubuntu.openjdk17
index 1d02d35..fdcea08 100644
--- a/open-liberty_beta-java17/Dockerfile.ubuntu.openjdk17
+++ b/open-liberty_beta-java17/Dockerfile.ubuntu.openjdk17
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-17-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.10-beta
-ARG LIBERTY_SHA=5270541e71c1d4517457931fd1be3a234d1a1ad5
+ARG LIBERTY_VERSION=25.0.0.11-beta
+ARG LIBERTY_SHA=ad751b0af9e656d1bb9e477d01b63ae8faa60908
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/beta/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -99,8 +101,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +112,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml   
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_beta-java17/helpers/runtime/docker-server.sh b/open-liberty_beta-java17/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_beta-java17/helpers/runtime/docker-server.sh
+++ b/open-liberty_beta-java17/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_beta/Dockerfile.ubuntu.openjdk8 b/open-liberty_beta/Dockerfile.ubuntu.openjdk8
index a6f2d25..b7bf5b2 100644
--- a/open-liberty_beta/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_beta/Dockerfile.ubuntu.openjdk8
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-8-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.10-beta
-ARG LIBERTY_SHA=5270541e71c1d4517457931fd1be3a234d1a1ad5
+ARG LIBERTY_VERSION=25.0.0.11-beta
+ARG LIBERTY_SHA=ad751b0af9e656d1bb9e477d01b63ae8faa60908
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/beta/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -99,8 +101,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +112,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml   
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_beta/helpers/runtime/docker-server.sh b/open-liberty_beta/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_beta/helpers/runtime/docker-server.sh
+++ b/open-liberty_beta/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11 b/open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
index 5dbb166..102268c 100644
--- a/open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-11-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_SHA=951b549b9f2bf42e9ddf753a089524d2e4d24276
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=728ce77fbfbaebb26fa857db332ad03241a0d52d
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -99,8 +101,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +112,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_full-java11-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_full-java11-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17 b/open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
index 2e9cd09..f14a537 100644
--- a/open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-17-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_SHA=951b549b9f2bf42e9ddf753a089524d2e4d24276
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=728ce77fbfbaebb26fa857db332ad03241a0d52d
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -99,8 +101,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +112,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_full-java17-openj9/helpers/runtime/docker-server.sh b/open-liberty_full-java17-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_full-java17-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_full-java17-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11 b/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
index a8b9461..62df0cf 100644
--- a/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-11-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_SHA=21343f004335a93e1ca93d8b42d0243c860b01d0
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=78dfbddacc7efe6b203fbe34558357002447a9ca
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -97,8 +99,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -110,7 +110,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_kernel-slim-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17 b/open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
index 5228bef..0c0a696 100644
--- a/open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-17-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_SHA=21343f004335a93e1ca93d8b42d0243c860b01d0
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=78dfbddacc7efe6b203fbe34558357002447a9ca
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -97,8 +99,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -110,7 +110,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_kernel-slim-java17-openj9/helpers/runtime/docker-server.sh b/open-liberty_kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
index 5bbfcf9..dec6cc2 100644
--- a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-8-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_SHA=21343f004335a93e1ca93d8b42d0243c860b01d0
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=78dfbddacc7efe6b203fbe34558357002447a9ca
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -97,8 +99,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -110,7 +110,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_kernel-slim-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_latest/Dockerfile.ubuntu.openjdk8 b/open-liberty_latest/Dockerfile.ubuntu.openjdk8
index 0ca25da..70dfc0c 100644
--- a/open-liberty_latest/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_latest/Dockerfile.ubuntu.openjdk8
@@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-8-jre-jammy
 
 USER root
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_SHA=951b549b9f2bf42e9ddf753a089524d2e4d24276
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_SHA=728ce77fbfbaebb26fa857db332ad03241a0d52d
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
 
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build:/opt/ol/helpers/runtime \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -86,6 +86,8 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
     && ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p $WLP_OUTPUT_DIR/defaultServer \
@@ -99,8 +101,6 @@ RUN mkdir /logs \
     && ln -s /opt/ol/fixes /fixes \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /opt/ol/wlp/usr \
     && chmod -R g+rw /opt/ol/wlp/usr \
     && chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +112,11 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
+    && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/open-liberty_latest/helpers/runtime/docker-server.sh b/open-liberty_latest/helpers/runtime/docker-server.sh
index 9ee5f0d..51a6b25 100755
--- a/open-liberty_latest/helpers/runtime/docker-server.sh
+++ b/open-liberty_latest/helpers/runtime/docker-server.sh
@@ -129,6 +129,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/websphere-liberty_25.0.0.3-full-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_25.0.0.10-full-java11-openj9/Dockerfile.ubuntu.openjdk11
similarity index 96%
rename from websphere-liberty_25.0.0.3-full-java11-openj9/Dockerfile.ubuntu.openjdk11
rename to websphere-liberty_25.0.0.10-full-java11-openj9/Dockerfile.ubuntu.openjdk11
index d7da21f..9fc9f95 100644
--- a/websphere-liberty_25.0.0.3-full-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_25.0.0.10-full-java11-openj9/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.3-kernel-java11-openj9
+FROM websphere-liberty:25.0.0.10-kernel-java11-openj9
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_25.0.0.3-full-java11-openj9/server.xml b/websphere-liberty_25.0.0.10-full-java11-openj9/server.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-full-java11-openj9/server.xml
rename to websphere-liberty_25.0.0.10-full-java11-openj9/server.xml
diff --git a/websphere-liberty_25.0.0.3-full-java17-openj9/Dockerfile.ubuntu.openjdk17 b/websphere-liberty_25.0.0.10-full-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
rename from websphere-liberty_25.0.0.3-full-java17-openj9/Dockerfile.ubuntu.openjdk17
rename to websphere-liberty_25.0.0.10-full-java17-openj9/Dockerfile.ubuntu.openjdk17
index df95e2d..be1d3b2 100644
--- a/websphere-liberty_25.0.0.3-full-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/websphere-liberty_25.0.0.10-full-java17-openj9/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.3-kernel-java17-openj9
+FROM websphere-liberty:25.0.0.10-kernel-java17-openj9
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_25.0.0.3-full-java17-openj9/server.xml b/websphere-liberty_25.0.0.10-full-java17-openj9/server.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-full-java17-openj9/server.xml
rename to websphere-liberty_25.0.0.10-full-java17-openj9/server.xml
diff --git a/websphere-liberty_25.0.0.3-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_25.0.0.10-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 96%
rename from websphere-liberty_25.0.0.3-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
rename to websphere-liberty_25.0.0.10-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index 419daea..80fe2ee 100644
--- a/websphere-liberty_25.0.0.3-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_25.0.0.10-full-java8-ibmjava/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.3-kernel-java8-ibmjava
+FROM websphere-liberty:25.0.0.10-kernel-java8-ibmjava
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/websphere-liberty_25.0.0.3-full-java8-ibmjava/server.xml b/websphere-liberty_25.0.0.10-full-java8-ibmjava/server.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-full-java8-ibmjava/server.xml
rename to websphere-liberty_25.0.0.10-full-java8-ibmjava/server.xml
diff --git a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_25.0.0.10-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
similarity index 95%
copy from websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to websphere-liberty_25.0.0.10-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
index 3283119..a075306 100644
--- a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_25.0.0.10-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
-ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
+ARG LIBERTY_SHA=5b79d37e3815f53d14fe72e9cd90dd803fd5dafa
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -93,7 +93,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -108,6 +108,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -131,12 +133,14 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/NOTICES b/websphere-liberty_25.0.0.10-kernel-java11-openj9/NOTICES
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/NOTICES
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/NOTICES
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/fixes/.gitkeep b/websphere-liberty_25.0.0.10-kernel-java11-openj9/fixes/.gitkeep
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/fixes/.gitkeep
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/fixes/.gitkeep
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/checkpoint.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/checkpoint.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/checkpoint.sh
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/checkpoint.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configure.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configure.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configure.sh
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/configure.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/features.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/features.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/features.sh
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/features.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/internal/features-installed.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/internal/features-installed.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/internal/features-installed.sh
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/internal/features-installed.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/internal/logger.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/internal/logger.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/internal/logger.sh
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/internal/logger.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/pidplus.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/pidplus.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/pidplus.sh
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/pidplus.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/populate_scc.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/populate_scc.sh
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_25.0.0.6-kernel-java17-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/docker-server.sh
similarity index 95%
copy from websphere-liberty_25.0.0.6-kernel-java17-openj9/helpers/runtime/docker-server.sh
copy to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/docker-server.sh
index b1217b2..3452ff7 100755
--- a/websphere-liberty_25.0.0.6-kernel-java17-openj9/helpers/runtime/docker-server.sh
+++ b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/docker-server.sh
@@ -143,6 +143,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/livenessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
copy to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/livenessHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/readinessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
copy to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/readinessHealthCheck.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/runtime/restore-server.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/restore-server.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/runtime/restore-server.sh
rename to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/restore-server.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh b/websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/startupHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
copy to websphere-liberty_25.0.0.10-kernel-java11-openj9/helpers/runtime/startupHealthCheck.sh
diff --git a/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17 b/websphere-liberty_25.0.0.10-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 95%
copy from websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
copy to websphere-liberty_25.0.0.10-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
index fba9d37..cbdbafd 100644
--- a/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/websphere-liberty_25.0.0.10-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
-ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
+ARG LIBERTY_SHA=5b79d37e3815f53d14fe72e9cd90dd803fd5dafa
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -93,7 +93,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -108,6 +108,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -131,12 +133,14 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/NOTICES b/websphere-liberty_25.0.0.10-kernel-java17-openj9/NOTICES
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/NOTICES
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/NOTICES
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/fixes/.gitkeep b/websphere-liberty_25.0.0.10-kernel-java17-openj9/fixes/.gitkeep
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/fixes/.gitkeep
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/fixes/.gitkeep
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/checkpoint.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/checkpoint.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/checkpoint.sh
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/checkpoint.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configure.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configure.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configure.sh
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/configure.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/features.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/features.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/features.sh
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/features.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/infinispan-client-setup.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/internal/features-installed.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/internal/features-installed.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/internal/features-installed.sh
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/internal/features-installed.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/internal/logger.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/internal/logger.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/internal/logger.sh
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/internal/logger.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/pidplus.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/pidplus.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/pidplus.sh
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/pidplus.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/populate_scc.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/populate_scc.sh
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_25.0.0.6-kernel-java17-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/docker-server.sh
similarity index 95%
copy from websphere-liberty_25.0.0.6-kernel-java17-openj9/helpers/runtime/docker-server.sh
copy to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/docker-server.sh
index b1217b2..3452ff7 100755
--- a/websphere-liberty_25.0.0.6-kernel-java17-openj9/helpers/runtime/docker-server.sh
+++ b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/docker-server.sh
@@ -143,6 +143,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/livenessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
copy to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/livenessHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/readinessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
copy to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/readinessHealthCheck.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/runtime/restore-server.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/restore-server.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/runtime/restore-server.sh
rename to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/restore-server.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh b/websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/startupHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
copy to websphere-liberty_25.0.0.10-kernel-java17-openj9/helpers/runtime/startupHealthCheck.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 94%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index 5692cb8..a0bec64 100644
--- a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.3
-ARG LIBERTY_BUILD_LABEL=cl250320250310-1902
-ARG LIBERTY_SHA=f28041b7990da53aff2272a2fab58c9a1716a646
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
+ARG LIBERTY_SHA=5b79d37e3815f53d14fe72e9cd90dd803fd5dafa
 
 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" \
@@ -98,7 +98,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -113,6 +113,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -136,12 +138,14 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/NOTICES b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/NOTICES
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/NOTICES
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/NOTICES
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/fixes/.gitkeep b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/fixes/.gitkeep
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/fixes/.gitkeep
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/fixes/.gitkeep
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/checkpoint.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/checkpoint.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/checkpoint.sh
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/checkpoint.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sessioncache-features.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sessioncache-features.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configure.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configure.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configure.sh
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/configure.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/features.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/features.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/features.sh
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/features.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/internal/features-installed.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/internal/features-installed.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/internal/features-installed.sh
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/internal/features-installed.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/internal/logger.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/internal/logger.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/internal/logger.sh
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/internal/logger.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/pidplus.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/pidplus.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/pidplus.sh
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/pidplus.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/populate_scc.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/populate_scc.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/populate_scc.sh
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_25.0.0.6-kernel-java17-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
similarity index 95%
copy from websphere-liberty_25.0.0.6-kernel-java17-openj9/helpers/runtime/docker-server.sh
copy to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
index b1217b2..3452ff7 100755
--- a/websphere-liberty_25.0.0.6-kernel-java17-openj9/helpers/runtime/docker-server.sh
+++ b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
@@ -143,6 +143,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/livenessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/livenessHealthCheck.sh
copy to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/livenessHealthCheck.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/readinessHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/readinessHealthCheck.sh
copy to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/readinessHealthCheck.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/runtime/restore-server.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/restore-server.sh
similarity index 100%
rename from websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/runtime/restore-server.sh
rename to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/restore-server.sh
diff --git a/open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh b/websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/startupHealthCheck.sh
similarity index 100%
copy from open-liberty_25.0.0.6-full-java11-openj9/helpers/runtime/startupHealthCheck.sh
copy to websphere-liberty_25.0.0.10-kernel-java8-ibmjava/helpers/runtime/startupHealthCheck.sh
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_25.0.0.3-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
deleted file mode 100644
index 129b8a6..0000000
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_25.0.0.3-kernel-java11-openj9/helpers/runtime/docker-server.sh
deleted file mode 100755
index 8df65ef..0000000
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17 b/websphere-liberty_25.0.0.3-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
deleted file mode 100644
index a77d09d..0000000
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_25.0.0.3-kernel-java17-openj9/helpers/runtime/docker-server.sh
deleted file mode 100755
index 8df65ef..0000000
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/runtime/docker-server.sh b/websphere-liberty_25.0.0.3-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
deleted file mode 100755
index 8df65ef..0000000
diff --git a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
index 3283119..a075306 100644
--- a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
-ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
+ARG LIBERTY_SHA=5b79d37e3815f53d14fe72e9cd90dd803fd5dafa
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -93,7 +93,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -108,6 +108,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -131,12 +133,14 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/websphere-liberty_kernel-java11-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_kernel-java11-openj9/helpers/runtime/docker-server.sh
index b1217b2..3452ff7 100755
--- a/websphere-liberty_kernel-java11-openj9/helpers/runtime/docker-server.sh
+++ b/websphere-liberty_kernel-java11-openj9/helpers/runtime/docker-server.sh
@@ -143,6 +143,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17 b/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
index fba9d37..cbdbafd 100644
--- a/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
-ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
+ARG LIBERTY_SHA=5b79d37e3815f53d14fe72e9cd90dd803fd5dafa
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -93,7 +93,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -108,6 +108,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -131,12 +133,14 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/websphere-liberty_kernel-java17-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_kernel-java17-openj9/helpers/runtime/docker-server.sh
index b1217b2..3452ff7 100755
--- a/websphere-liberty_kernel-java17-openj9/helpers/runtime/docker-server.sh
+++ b/websphere-liberty_kernel-java17-openj9/helpers/runtime/docker-server.sh
@@ -143,6 +143,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then
diff --git a/websphere-liberty_kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index 5e5e427..a0bec64 100644
--- a/websphere-liberty_kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
@@ -19,9 +19,9 @@ USER root
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
 
-ARG LIBERTY_VERSION=25.0.0.9
-ARG LIBERTY_BUILD_LABEL=cl250920250821-1629
-ARG LIBERTY_SHA=7bfd3fb8cb8034df7e237e354af8da53892df731
+ARG LIBERTY_VERSION=25.0.0.10
+ARG LIBERTY_BUILD_LABEL=cl251020250923-1355
+ARG LIBERTY_SHA=5b79d37e3815f53d14fe72e9cd90dd803fd5dafa
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
       org.opencontainers.image.vendor="IBM" \
@@ -98,7 +98,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
-ENV LOG_DIR=/logs \
+ENV LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ibm/wlp/output \
     OPENJ9_SCC=$OPENJ9_SCC
 
@@ -113,6 +113,8 @@ COPY fixes/ /opt/ibm/fixes/
 
 # Create symlinks && set permissions for non-root user
 RUN mkdir /logs \
+    && chown -R 1001:0 /logs \
+    && chmod -R g+rw /logs \
     && mkdir /etc/wlp \
     && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \
     && mkdir -p /home/default \
@@ -136,12 +138,14 @@ RUN mkdir /logs \
     && chmod -R g+rw /opt/ibm/wlp/usr \
     && chown -R 1001:0 /opt/ibm/wlp/output \
     && chmod -R g+rw /opt/ibm/wlp/output \
-    && chown -R 1001:0 /logs \
-    && chmod -R g+rw /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && chown -R 1001:0 /home/default \
-    && chmod -R g+rw /home/default 
+    && chmod -R g+rw /home/default \
+    && ln -s /logs /liberty/logs \
+    && mkdir /serviceability \
+    && chown -R 1001:0 /serviceability \
+    && chmod -R g+rw /serviceability
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/websphere-liberty_kernel-java8-ibmjava/helpers/runtime/docker-server.sh b/websphere-liberty_kernel-java8-ibmjava/helpers/runtime/docker-server.sh
index b1217b2..3452ff7 100755
--- a/websphere-liberty_kernel-java8-ibmjava/helpers/runtime/docker-server.sh
+++ b/websphere-liberty_kernel-java8-ibmjava/helpers/runtime/docker-server.sh
@@ -143,6 +143,13 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
 fi
 
+# If SERVICEABILITY_NAMESPACE is set, link /liberty/logs to the serviceability directory
+if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+  SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
+  mkdir -p $SERVICEABILITY_FOLDER
+  rm /liberty/logs
+  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+fi
 
 # Pass on to the real server run
 if [ -d "/output/workarea/checkpoint/image" ]; then

Relevant Maintainers:

@yosifkit
Copy link
Member

Would it be important to prevent users from breaking themselves if they had whitespace in their SERVICEABILITY_NAMESPACE or HOSTNAME?

   SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME/logs"
-  mkdir -p $SERVICEABILITY_FOLDER
+  mkdir -p "$SERVICEABILITY_FOLDER"
   rm /liberty/logs
-  ln -s $SERVICEABILITY_FOLDER /liberty/logs
+  ln -s "$SERVICEABILITY_FOLDER" /liberty/logs

@leochr
Copy link
Contributor

leochr commented Oct 14, 2025

@yosifkit SERVICEABILITY_NAMESPACE or HOSTNAME will be automatically set by Kubernetes or Liberty Operator (or some orchestrator/automation), hence the chance of user error is very slim. Thanks

@leochr
Copy link
Contributor

leochr commented Oct 15, 2025

Few users inquired when the 25.0.0.10 images will be available. Could this PR be merged please? Thank you.

@leochr leochr mentioned this pull request Oct 15, 2025
Closed
@yosifkit
Copy link
Member

I would still highly recommend defense in depth on your shell scripts, even if the values come from automation.

@yosifkit yosifkit merged commit 2ae527f into docker-library:master Oct 16, 2025
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees

No one assigned

Labels

library/open-liberty library/websphere-liberty

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@gkertasef @tianon @yosifkit @leochr