diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11
index 52f1da446..3d265ef38 100644
--- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11
@@ -154,6 +154,7 @@ RUN mkdir /logs \
     && chmod -R g+rw /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 \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default 
 
diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17
index 24a074ec3..5a0a60a73 100644
--- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17
@@ -154,6 +154,7 @@ RUN mkdir /logs \
     && chmod -R g+rw /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 \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default 
 
diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8
index d07705167..1b017724c 100644
--- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8
@@ -154,6 +154,7 @@ RUN mkdir /logs \
     && chmod -R g+rw /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 \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default 
 
diff --git a/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh
index 58d5293b5..2b2fa90b3 100755
--- a/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh
+++ b/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh
@@ -6,6 +6,23 @@ do
     pidplus.sh
 done
 
+if [ -e /etc/instanton.ld.so.cache ]; then
+    cp /etc/instanton.ld.so.cache /etc/ld.so.cache
+fi
+
+ARCH="$(uname -m)";
+case "${ARCH}" in
+    ppc64el|ppc64le)
+        export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode"
+        ;;
+    s390x)
+        export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode"
+        ;;
+    *)
+        ;;
+esac;
+
+
 echo "Performing checkpoint --at=$1"
 /opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1
 
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
index 52f1da446..3d265ef38 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -154,6 +154,7 @@ RUN mkdir /logs \
     && chmod -R g+rw /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 \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default 
 
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index 24a074ec3..5a0a60a73 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -154,6 +154,7 @@ RUN mkdir /logs \
     && chmod -R g+rw /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 \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default 
 
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
index d07705167..1b017724c 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -154,6 +154,7 @@ RUN mkdir /logs \
     && chmod -R g+rw /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 \
     && chown -R 1001:0 /home/default \
     && chmod -R g+rw /home/default 
 
diff --git a/ga/latest/kernel/helpers/build/checkpoint.sh b/ga/latest/kernel/helpers/build/checkpoint.sh
index 58d5293b5..2b2fa90b3 100755
--- a/ga/latest/kernel/helpers/build/checkpoint.sh
+++ b/ga/latest/kernel/helpers/build/checkpoint.sh
@@ -6,6 +6,23 @@ do
     pidplus.sh
 done
 
+if [ -e /etc/instanton.ld.so.cache ]; then
+    cp /etc/instanton.ld.so.cache /etc/ld.so.cache
+fi
+
+ARCH="$(uname -m)";
+case "${ARCH}" in
+    ppc64el|ppc64le)
+        export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode"
+        ;;
+    s390x)
+        export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode"
+        ;;
+    *)
+        ;;
+esac;
+
+
 echo "Performing checkpoint --at=$1"
 /opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1