From afaab4155872d982d9b688a38a68f77d9da4a7db Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Tue, 5 Nov 2024 16:33:47 -0500
Subject: [PATCH 1/2] Hide keystore logs

---
 ga/latest/kernel/Dockerfile.ubi.ibmjava8      |  4 +--
 ga/latest/kernel/Dockerfile.ubi.openjdk11     |  4 +--
 ga/latest/kernel/Dockerfile.ubi.openjdk17     |  4 +--
 ga/latest/kernel/Dockerfile.ubi.openjdk21     |  4 +--
 ga/latest/kernel/Dockerfile.ubi.openjdk8      |  4 +--
 ga/latest/kernel/Dockerfile.ubuntu.ibmjava8   |  6 ++--
 ga/latest/kernel/Dockerfile.ubuntu.openjdk11  |  6 ++--
 ga/latest/kernel/Dockerfile.ubuntu.openjdk17  |  6 ++--
 ga/latest/kernel/helpers/build/configure.sh   | 12 ++++----
 ga/latest/kernel/helpers/build/features.sh    |  6 ++--
 .../helpers/build/infinispan-client-setup.sh  |  6 ++--
 .../kernel/helpers/build/internal/logger.sh   | 30 +++++++++++++++++++
 .../kernel/helpers/build/populate_scc.sh      |  6 ++--
 13 files changed, 53 insertions(+), 45 deletions(-)
 create mode 100755 ga/latest/kernel/helpers/build/internal/logger.sh

diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
index 495598cbe..3449a1e1c 100644
--- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
@@ -59,8 +59,6 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
       org.opencontainers.image.title="IBM WebSphere Liberty" \
-      liberty.version="$LIBERTY_VERSION" \
-      com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \
       vendor="IBM" \
       name="IBM WebSphere Liberty" \
       version="$LIBERTY_VERSION" \
@@ -148,7 +146,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R ug+rwx /opt/ibm/helpers \
+    && chmod -R g+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
index 4017a15c7..bb636d3f3 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -60,8 +60,6 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
       org.opencontainers.image.title="IBM WebSphere Liberty" \
-      liberty.version="$LIBERTY_VERSION" \
-      com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \
       vendor="IBM" \
       name="IBM WebSphere Liberty" \
       version="$LIBERTY_VERSION" \
@@ -149,7 +147,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R ug+rwx /opt/ibm/helpers \
+    && chmod -R g+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index a49bdf3c9..03df712af 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -59,8 +59,6 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
       org.opencontainers.image.title="IBM WebSphere Liberty" \
-      liberty.version="$LIBERTY_VERSION" \
-      com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \
       vendor="IBM" \
       name="IBM WebSphere Liberty" \
       version="$LIBERTY_VERSION" \
@@ -148,7 +146,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R ug+rwx /opt/ibm/helpers \
+    && chmod -R g+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/latest/kernel/Dockerfile.ubi.openjdk21
index f5f8b8417..19c7ff902 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk21
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk21
@@ -58,8 +58,6 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
       org.opencontainers.image.title="IBM WebSphere Liberty" \
-      liberty.version="$LIBERTY_VERSION" \
-      com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \
       vendor="IBM" \
       name="IBM WebSphere Liberty" \
       version="$LIBERTY_VERSION" \
@@ -148,7 +146,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R ug+rwx /opt/ibm/helpers \
+    && chmod -R g+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
index 0c2ffc4c0..16dcbeb21 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -59,8 +59,6 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
       org.opencontainers.image.title="IBM WebSphere Liberty" \
-      liberty.version="$LIBERTY_VERSION" \
-      com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \
       vendor="IBM" \
       name="IBM WebSphere Liberty" \
       version="$LIBERTY_VERSION" \
@@ -148,7 +146,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R ug+rwx /opt/ibm/helpers \
+    && chmod -R g+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
index ea8cbbb59..82618d324 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -30,9 +30,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.version="$LIBERTY_VERSION" \
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
-      org.opencontainers.image.title="IBM WebSphere Liberty" \
-      liberty.version="$LIBERTY_VERSION" \
-      com.ibm.websphere.liberty.version="$LIBERTY_VERSION"
+      org.opencontainers.image.title="IBM WebSphere Liberty"
 
 ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
 
@@ -129,7 +127,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R ug+rwx /opt/ibm/helpers \
+    && chmod -R g+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index 7307b2a66..9e32932d8 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -30,9 +30,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.version="$LIBERTY_VERSION" \
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
-      org.opencontainers.image.title="IBM WebSphere Liberty" \
-      liberty.version="$LIBERTY_VERSION" \
-      com.ibm.websphere.liberty.version="$LIBERTY_VERSION"
+      org.opencontainers.image.title="IBM WebSphere Liberty"
 
 ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
 
@@ -124,7 +122,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R ug+rwx /opt/ibm/helpers \
+    && chmod -R g+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index 7121b64f1..2b10425f1 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -30,9 +30,7 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.version="$LIBERTY_VERSION" \
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
-      org.opencontainers.image.title="IBM WebSphere Liberty" \
-      liberty.version="$LIBERTY_VERSION" \
-      com.ibm.websphere.liberty.version="$LIBERTY_VERSION"
+      org.opencontainers.image.title="IBM WebSphere Liberty"
 
 ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
 
@@ -124,7 +122,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R ug+rwx /opt/ibm/helpers \
+    && chmod -R g+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/helpers/build/configure.sh b/ga/latest/kernel/helpers/build/configure.sh
index da873b2b2..77f0c7698 100755
--- a/ga/latest/kernel/helpers/build/configure.sh
+++ b/ga/latest/kernel/helpers/build/configure.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# (C) Copyright IBM Corporation 2020, 2023.
+# (C) Copyright IBM Corporation 2020, 2025.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,9 +20,7 @@ else
   FEATURES_INSTALLED=false
 fi
 
-if [ "$VERBOSE" != "true" ]; then
-  exec >/dev/null
-fi
+. /opt/ibm/helpers/build/internal/logger.sh
 
 set -Eeox pipefail
 
@@ -128,8 +126,10 @@ function main() {
   if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then
     if [ ! -e $keystorePath ]; then
       # Generate the keystore.xml
-      export KEYSTOREPWD=$(openssl rand -base64 32)
+      hideLogs
+      KEYSTOREPWD=$(openssl rand -base64 32)
       sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
+      showLogs
       chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml
     fi
   fi
@@ -231,4 +231,4 @@ function parseCommaList() {
   done
 }
 
-main "$@"
+main "$@"
\ No newline at end of file
diff --git a/ga/latest/kernel/helpers/build/features.sh b/ga/latest/kernel/helpers/build/features.sh
index f6ac61528..a9469b85c 100755
--- a/ga/latest/kernel/helpers/build/features.sh
+++ b/ga/latest/kernel/helpers/build/features.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# (C) Copyright IBM Corporation 2023.
+# (C) Copyright IBM Corporation 2023, 2025.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-if [ "$VERBOSE" != "true" ]; then
-  exec >/dev/null
-fi
+. /opt/ibm/helpers/build/internal/logger.sh
 
 set -Eeox pipefail
 
diff --git a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh
index 37dcda2b5..7530d1f96 100755
--- a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh
+++ b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# (C) Copyright IBM Corporation 2020.
+# (C) Copyright IBM Corporation 2020, 2025.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-if [ "$VERBOSE" != "true" ]; then
-  exec >/dev/null
-fi
+. /opt/ibm/helpers/build/internal/logger.sh
 
 set -Eeox pipefail
 
diff --git a/ga/latest/kernel/helpers/build/internal/logger.sh b/ga/latest/kernel/helpers/build/internal/logger.sh
new file mode 100755
index 000000000..a4fd59ca3
--- /dev/null
+++ b/ga/latest/kernel/helpers/build/internal/logger.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# (C) Copyright IBM Corporation 2025.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+function main() {
+    if [ "$VERBOSE" != "true" ]; then
+        exec >/dev/null
+    fi
+}
+
+function hideLogs() {
+    exec 3>&1 >/dev/null 4>&2 2>/dev/null
+}
+
+function showLogs() {
+    exec 1>&3 3>&- 2>&4 4>&-
+}
+
+main
\ No newline at end of file
diff --git a/ga/latest/kernel/helpers/build/populate_scc.sh b/ga/latest/kernel/helpers/build/populate_scc.sh
index c794e5a21..ac2b762e8 100755
--- a/ga/latest/kernel/helpers/build/populate_scc.sh
+++ b/ga/latest/kernel/helpers/build/populate_scc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# (C) Copyright IBM Corporation 2020, 2024
+# (C) Copyright IBM Corporation 2020, 2025.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-if [ "$VERBOSE" != "true" ]; then
-  exec >/dev/null
-fi
+. /opt/ibm/helpers/build/internal/logger.sh
 
 set -Eeox pipefail
 

From 192e0403785b0300ff91ed68b01bf2a71e011d9a Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Tue, 14 Jan 2025 11:33:14 -0500
Subject: [PATCH 2/2] Revert ga/latest/kernel/Dockerfile changes

---
 ga/latest/kernel/Dockerfile.ubi.ibmjava8     | 4 +++-
 ga/latest/kernel/Dockerfile.ubi.openjdk11    | 4 +++-
 ga/latest/kernel/Dockerfile.ubi.openjdk17    | 4 +++-
 ga/latest/kernel/Dockerfile.ubi.openjdk21    | 4 +++-
 ga/latest/kernel/Dockerfile.ubi.openjdk8     | 4 +++-
 ga/latest/kernel/Dockerfile.ubuntu.ibmjava8  | 6 ++++--
 ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 6 ++++--
 ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 6 ++++--
 8 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
index 3449a1e1c..495598cbe 100644
--- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
@@ -59,6 +59,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
       org.opencontainers.image.title="IBM WebSphere Liberty" \
+      liberty.version="$LIBERTY_VERSION" \
+      com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \
       vendor="IBM" \
       name="IBM WebSphere Liberty" \
       version="$LIBERTY_VERSION" \
@@ -146,7 +148,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R g+rwx /opt/ibm/helpers \
+    && chmod -R ug+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
index bb636d3f3..4017a15c7 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -60,6 +60,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
       org.opencontainers.image.title="IBM WebSphere Liberty" \
+      liberty.version="$LIBERTY_VERSION" \
+      com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \
       vendor="IBM" \
       name="IBM WebSphere Liberty" \
       version="$LIBERTY_VERSION" \
@@ -147,7 +149,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R g+rwx /opt/ibm/helpers \
+    && chmod -R ug+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index 03df712af..a49bdf3c9 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -59,6 +59,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
       org.opencontainers.image.title="IBM WebSphere Liberty" \
+      liberty.version="$LIBERTY_VERSION" \
+      com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \
       vendor="IBM" \
       name="IBM WebSphere Liberty" \
       version="$LIBERTY_VERSION" \
@@ -146,7 +148,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R g+rwx /opt/ibm/helpers \
+    && chmod -R ug+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/latest/kernel/Dockerfile.ubi.openjdk21
index 19c7ff902..f5f8b8417 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk21
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk21
@@ -58,6 +58,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
       org.opencontainers.image.title="IBM WebSphere Liberty" \
+      liberty.version="$LIBERTY_VERSION" \
+      com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \
       vendor="IBM" \
       name="IBM WebSphere Liberty" \
       version="$LIBERTY_VERSION" \
@@ -146,7 +148,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R g+rwx /opt/ibm/helpers \
+    && chmod -R ug+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
index 16dcbeb21..0c2ffc4c0 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -59,6 +59,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
       org.opencontainers.image.title="IBM WebSphere Liberty" \
+      liberty.version="$LIBERTY_VERSION" \
+      com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \
       vendor="IBM" \
       name="IBM WebSphere Liberty" \
       version="$LIBERTY_VERSION" \
@@ -146,7 +148,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R g+rwx /opt/ibm/helpers \
+    && chmod -R ug+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
index 82618d324..ea8cbbb59 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -30,7 +30,9 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.version="$LIBERTY_VERSION" \
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
-      org.opencontainers.image.title="IBM WebSphere Liberty"
+      org.opencontainers.image.title="IBM WebSphere Liberty" \
+      liberty.version="$LIBERTY_VERSION" \
+      com.ibm.websphere.liberty.version="$LIBERTY_VERSION"
 
 ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
 
@@ -127,7 +129,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R g+rwx /opt/ibm/helpers \
+    && chmod -R ug+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index 9e32932d8..7307b2a66 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -30,7 +30,9 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.version="$LIBERTY_VERSION" \
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
-      org.opencontainers.image.title="IBM WebSphere Liberty"
+      org.opencontainers.image.title="IBM WebSphere Liberty" \
+      liberty.version="$LIBERTY_VERSION" \
+      com.ibm.websphere.liberty.version="$LIBERTY_VERSION"
 
 ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
 
@@ -122,7 +124,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R g+rwx /opt/ibm/helpers \
+    && chmod -R ug+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index 2b10425f1..7121b64f1 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -30,7 +30,9 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend
       org.opencontainers.image.version="$LIBERTY_VERSION" \
       org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://ibm.biz/wl-app-image-template" \
-      org.opencontainers.image.title="IBM WebSphere Liberty"
+      org.opencontainers.image.title="IBM WebSphere Liberty" \
+      liberty.version="$LIBERTY_VERSION" \
+      com.ibm.websphere.liberty.version="$LIBERTY_VERSION"
 
 ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build
 
@@ -122,7 +124,7 @@ RUN mkdir /logs \
     && chown -R 1001:0 /config \
     && chmod -R g+rw /config \
     && chown -R 1001:0 /opt/ibm/helpers \
-    && chmod -R g+rwx /opt/ibm/helpers \
+    && chmod -R ug+rwx /opt/ibm/helpers \
     && chown -R 1001:0 /opt/ibm/fixes \
     && chmod -R g+rwx /opt/ibm/fixes \
     && chown -R 1001:0 /opt/ibm/wlp/usr \