diff --git a/releases/latest/beta/Dockerfile.ubi.openjdk21 b/releases/latest/beta/Dockerfile.ubi.openjdk21
index 7d35248d..0884287f 100644
--- a/releases/latest/beta/Dockerfile.ubi.openjdk21
+++ b/releases/latest/beta/Dockerfile.ubi.openjdk21
@@ -97,7 +97,7 @@ COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -122,8 +122,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 \
@@ -136,7 +134,9 @@ RUN mkdir /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
-    && 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/beta/Dockerfile.ubuntu.openjdk11 b/releases/latest/beta/Dockerfile.ubuntu.openjdk11
index 657fc657..7297c8de 100644
--- a/releases/latest/beta/Dockerfile.ubuntu.openjdk11
+++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk11
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -99,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 \
@@ -112,7 +110,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/beta/Dockerfile.ubuntu.openjdk17 b/releases/latest/beta/Dockerfile.ubuntu.openjdk17
index 116b546f..695a302f 100644
--- a/releases/latest/beta/Dockerfile.ubuntu.openjdk17
+++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk17
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -99,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 \
@@ -112,7 +110,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/beta/Dockerfile.ubuntu.openjdk8 b/releases/latest/beta/Dockerfile.ubuntu.openjdk8
index 52e22d25..98a5273e 100644
--- a/releases/latest/beta/Dockerfile.ubuntu.openjdk8
+++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk8
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -99,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 \
@@ -112,7 +110,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/beta/helpers/runtime/docker-server.sh b/releases/latest/beta/helpers/runtime/docker-server.sh
index 4c36a2e1..c6ce5396 100755
--- a/releases/latest/beta/helpers/runtime/docker-server.sh
+++ b/releases/latest/beta/helpers/runtime/docker-server.sh
@@ -141,5 +141,11 @@ elif [[ ! -z "$WLP_CHECKPOINT" ]]; then
   checkpoint.sh "$TMP_CHECKPOINT"
 else
   # The default is to just exec the supplied CMD
+  if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+    SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME"
+    mkdir -p $SERVICEABILITY_FOLDER
+    rm /liberty/logs
+    ln -s $SERVICEABILITY_FOLDER /liberty/logs
+  fi
   exec "$@"
 fi
diff --git a/releases/latest/full/Dockerfile.ubi.ibmjava8 b/releases/latest/full/Dockerfile.ubi.ibmjava8
index 31c023f0..d9600199 100644
--- a/releases/latest/full/Dockerfile.ubi.ibmjava8
+++ b/releases/latest/full/Dockerfile.ubi.ibmjava8
@@ -96,7 +96,7 @@ RUN yum -y install openssl \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -121,8 +121,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 \
@@ -134,7 +132,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/full/Dockerfile.ubi.openjdk11 b/releases/latest/full/Dockerfile.ubi.openjdk11
index e50e98ea..4b7b90e7 100644
--- a/releases/latest/full/Dockerfile.ubi.openjdk11
+++ b/releases/latest/full/Dockerfile.ubi.openjdk11
@@ -96,7 +96,7 @@ RUN yum -y install openssl \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -121,8 +121,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 \
@@ -135,7 +133,9 @@ RUN mkdir /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
-    && 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/full/Dockerfile.ubi.openjdk17 b/releases/latest/full/Dockerfile.ubi.openjdk17
index 574a417a..a8f48717 100644
--- a/releases/latest/full/Dockerfile.ubi.openjdk17
+++ b/releases/latest/full/Dockerfile.ubi.openjdk17
@@ -96,7 +96,7 @@ RUN yum -y install openssl \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -121,8 +121,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 \
@@ -135,7 +133,9 @@ RUN mkdir /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
-    && 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/full/Dockerfile.ubi.openjdk8 b/releases/latest/full/Dockerfile.ubi.openjdk8
index d35f56ed..7c92b293 100644
--- a/releases/latest/full/Dockerfile.ubi.openjdk8
+++ b/releases/latest/full/Dockerfile.ubi.openjdk8
@@ -96,7 +96,7 @@ RUN yum -y install openssl \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -121,8 +121,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 \
@@ -135,7 +133,9 @@ RUN mkdir /logs \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
     && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
-    && 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/full/Dockerfile.ubuntu.openjdk11 b/releases/latest/full/Dockerfile.ubuntu.openjdk11
index 297b713e..c82632a4 100644
--- a/releases/latest/full/Dockerfile.ubuntu.openjdk11
+++ b/releases/latest/full/Dockerfile.ubuntu.openjdk11
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -99,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 \
@@ -112,7 +110,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/full/Dockerfile.ubuntu.openjdk17 b/releases/latest/full/Dockerfile.ubuntu.openjdk17
index 37cba1ef..902d391f 100644
--- a/releases/latest/full/Dockerfile.ubuntu.openjdk17
+++ b/releases/latest/full/Dockerfile.ubuntu.openjdk17
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -99,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 \
@@ -112,7 +110,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/full/Dockerfile.ubuntu.openjdk8 b/releases/latest/full/Dockerfile.ubuntu.openjdk8
index c2cf22be..5c974186 100644
--- a/releases/latest/full/Dockerfile.ubuntu.openjdk8
+++ b/releases/latest/full/Dockerfile.ubuntu.openjdk8
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -99,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 \
@@ -112,7 +110,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/full/helpers/runtime/docker-server.sh b/releases/latest/full/helpers/runtime/docker-server.sh
index 4c36a2e1..c6ce5396 100755
--- a/releases/latest/full/helpers/runtime/docker-server.sh
+++ b/releases/latest/full/helpers/runtime/docker-server.sh
@@ -141,5 +141,11 @@ elif [[ ! -z "$WLP_CHECKPOINT" ]]; then
   checkpoint.sh "$TMP_CHECKPOINT"
 else
   # The default is to just exec the supplied CMD
+  if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+    SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME"
+    mkdir -p $SERVICEABILITY_FOLDER
+    rm /liberty/logs
+    ln -s $SERVICEABILITY_FOLDER /liberty/logs
+  fi
   exec "$@"
 fi
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8
index 838c87df..ca972a3a 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8
+++ b/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8
@@ -96,7 +96,7 @@ RUN yum -y install openssl \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -119,8 +119,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 \
@@ -132,7 +130,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11
index 90bf3c95..05fa3037 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11
+++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11
@@ -96,7 +96,7 @@ RUN yum -y install openssl \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -119,8 +119,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 \
@@ -132,8 +130,9 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
-    && 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17
index e5418231..009f6e94 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17
+++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17
@@ -96,7 +96,7 @@ RUN yum -y install openssl \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -119,8 +119,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 \
@@ -132,8 +130,9 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
-    && 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8
index e98fa216..a3923a04 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8
+++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8
@@ -96,7 +96,7 @@ RUN yum -y install openssl \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -119,8 +119,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 \
@@ -132,8 +130,9 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
-    && 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.ibmjava8 b/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.ibmjava8
index 19ce01d5..9e150535 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.ibmjava8
+++ b/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.ibmjava8
@@ -106,7 +106,7 @@ COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -142,7 +142,9 @@ RUN mkdir /logs \
     && chmod -R g+rwx /opt/ol/fixes \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
-    && chmod -R g+rw /etc/wlp
+    && chmod -R g+rw /etc/wlp \
+    && ln -s /logs /liberty/logs \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk11 b/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk11
index edaa8fa4..7b482b08 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk11
+++ b/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk11
@@ -97,7 +97,7 @@ COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -134,7 +134,9 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi
+    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
+    && ln -s /logs /liberty/logs \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk17 b/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk17
index b5185a32..797bccfc 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk17
+++ b/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk17
@@ -97,7 +97,7 @@ COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -134,7 +134,9 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi
+    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
+    && ln -s /logs /liberty/logs \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk21 b/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk21
index 12af5bfe..8711e813 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk21
+++ b/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk21
@@ -97,7 +97,7 @@ COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -121,8 +121,6 @@ RUN mkdir /logs \
     && echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
     && 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 \
@@ -134,7 +132,9 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi
+    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
+    && ln -s /logs /liberty/logs \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk8 b/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk8
index 217eb8cc..79a18458 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk8
+++ b/releases/latest/kernel-slim/Dockerfile.ubi9-minimal.openjdk8
@@ -97,7 +97,7 @@ COPY --from=getRuntime /licenses /licenses
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -134,7 +134,9 @@ RUN mkdir /logs \
     && mkdir /etc/wlp \
     && chown -R 1001:0 /etc/wlp \
     && chmod -R g+rw /etc/wlp \
-    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi
+    && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
+    && ln -s /logs /liberty/logs \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11
index bbe2a411..3d959d53 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11
+++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -110,7 +110,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17
index 7bddc9f6..b39d4074 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17
+++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -110,7 +110,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8
index e3f91c35..f6261599 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8
+++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8
@@ -74,7 +74,7 @@ RUN apt-get update \
 
 # Set Path Shortcuts
 ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
-    LOG_DIR=/logs \
+    LOG_DIR=/liberty/logs \
     WLP_OUTPUT_DIR=/opt/ol/wlp/output \
     WLP_SKIP_MAXPERMSIZE=true \
     OPENJ9_SCC=$OPENJ9_SCC
@@ -110,7 +110,9 @@ 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 \
+    && chown -d 1001:0 /liberty/logs
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
diff --git a/releases/latest/kernel-slim/helpers/runtime/docker-server.sh b/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
index 4c36a2e1..c6ce5396 100755
--- a/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
+++ b/releases/latest/kernel-slim/helpers/runtime/docker-server.sh
@@ -141,5 +141,11 @@ elif [[ ! -z "$WLP_CHECKPOINT" ]]; then
   checkpoint.sh "$TMP_CHECKPOINT"
 else
   # The default is to just exec the supplied CMD
+  if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
+    SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME"
+    mkdir -p $SERVICEABILITY_FOLDER
+    rm /liberty/logs
+    ln -s $SERVICEABILITY_FOLDER /liberty/logs
+  fi
   exec "$@"
 fi