diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8
index e952cf6b..b3b76000 100644
--- a/ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8
@@ -31,8 +31,10 @@ RUN yum -y install unzip wget openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11 b/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11
index 478e0acc..630086ec 100644
--- a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11
@@ -32,8 +32,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17 b/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17
index 576702d7..39a5301c 100644
--- a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21 b/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21
index 912ddf76..88b3b2c3 100644
--- a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21
+++ b/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21
@@ -30,8 +30,10 @@ COPY resources/ /tmp/
 RUN microdnf -y install shadow-utils unzip wget findutils openssl \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8 b/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8
index 214a716c..bfffd41b 100644
--- a/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.6/kernel/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.6/kernel/Dockerfile.ubi.ibmjava8
index 94135ced..017c2da3 100644
--- a/ga/24.0.0.6/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/24.0.0.6/kernel/Dockerfile.ubi.ibmjava8
@@ -31,8 +31,10 @@ RUN yum -y install unzip wget openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk11 b/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk11
index a4626c8f..2872e361 100644
--- a/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk11
@@ -32,8 +32,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk17 b/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk17
index 1ee8d563..766489a6 100644
--- a/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk17
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk21 b/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk21
index 9be698aa..882d78ec 100644
--- a/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk21
+++ b/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk21
@@ -30,8 +30,10 @@ COPY resources/ /tmp/
 RUN microdnf -y install shadow-utils unzip wget findutils openssl \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk8 b/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk8
index 8a0d589f..2f9898fb 100644
--- a/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/24.0.0.6/kernel/Dockerfile.ubi.openjdk8
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.9/kernel/Dockerfile.ubi.ibmjava8
index 41b34910..b8eca611 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubi.ibmjava8
@@ -31,8 +31,10 @@ RUN yum -y install unzip wget openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk11 b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk11
index 5715e08c..7c15e7ed 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk11
@@ -32,8 +32,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk17 b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk17
index cb9be867..81f9685e 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk17
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk21 b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk21
index 293bee43..b1b4f45f 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk21
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk21
@@ -30,8 +30,10 @@ COPY resources/ /tmp/
 RUN microdnf -y install shadow-utils unzip wget findutils openssl \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk8 b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk8
index 29ecf2f9..eb53daf9 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk8
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
index e952cf6b..b3b76000 100644
--- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
@@ -31,8 +31,10 @@ RUN yum -y install unzip wget openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
index 478e0acc..630086ec 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -32,8 +32,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index 576702d7..39a5301c 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/latest/kernel/Dockerfile.ubi.openjdk21
index 912ddf76..88b3b2c3 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk21
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk21
@@ -30,8 +30,10 @@ COPY resources/ /tmp/
 RUN microdnf -y install shadow-utils unzip wget findutils openssl \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
index 214a716c..bfffd41b 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && yum clean all \
     && mkdir -p /licenses \
     && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && 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' )}  \
-    && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
+    && if [ ! -f /tmp/wlp.zip ]; then \
+         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' )}; \
+         wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
+       fi \
     && echo "$LIBERTY_SHA  /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
     && sha1sum -c /tmp/wlp.zip.sha1 \
     && chmod -R g+x /usr/bin \