diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
index b5583be27..616d74d84 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
+++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
@@ -12,38 +12,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:23.0.0.6-kernel-java8-ibmjava AS installBundle
+FROM websphere-liberty:23.0.0.6-kernel-java8-ibmjava
+
+USER root
+
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
-# If there is a local copy of the repository use that instead
-COPY resources/ /tmp/
-
 # Install the base bundle
 RUN set -eux; \
   if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     mkdir /opt/ibm/wlp/etc/; \
     echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
-    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  installUtility install --acceptLicense baseBundle; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     rm /opt/ibm/wlp/etc/repositories.properties; \
-  elif [ -f /tmp/wlpRepo.zip ]; then \
-    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
-  else \
-    installUtility install --acceptLicense baseBundle; \
   fi; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-FROM websphere-liberty:23.0.0.6-kernel-java8-ibmjava
-ARG VERBOSE=false
-
-# Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
-
 COPY --chown=1001:0 server.xml /config/
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
     && find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx
-
diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
index d983f604e..9f52f30b8 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
+++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
@@ -12,37 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:23.0.0.6-kernel-java11-openj9 AS installBundle
+FROM websphere-liberty:23.0.0.6-kernel-java11-openj9
 
 USER root
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
-# If there is a local copy of the repository use that instead
-COPY resources/ /tmp/
-
 # Install the base bundle
 RUN set -eux; \
   if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     mkdir /opt/ibm/wlp/etc/; \
     echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
-    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  installUtility install --acceptLicense baseBundle; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     rm /opt/ibm/wlp/etc/repositories.properties; \
-  elif [ -f /tmp/wlpRepo.zip ]; then \
-    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
-  else \
-    installUtility install --acceptLicense baseBundle; \
   fi; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-FROM websphere-liberty:23.0.0.6-kernel-java11-openj9
-ARG VERBOSE=false
-
-# Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
-
 COPY --chown=1001:0 server.xml /config/
 
 # Create a new SCC layer
diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
index 28fb016dd..4d269dfdc 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
+++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
@@ -12,37 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:23.0.0.6-kernel-java17-openj9 AS installBundle
+FROM websphere-liberty:23.0.0.6-kernel-java17-openj9
 
 USER root
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
-# If there is a local copy of the repository use that instead
-COPY resources/ /tmp/
-
 # Install the base bundle
 RUN set -eux; \
   if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     mkdir /opt/ibm/wlp/etc/; \
     echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
-    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  installUtility install --acceptLicense baseBundle; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     rm /opt/ibm/wlp/etc/repositories.properties; \
-  elif [ -f /tmp/wlpRepo.zip ]; then \
-    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
-  else \
-    installUtility install --acceptLicense baseBundle; \
   fi; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-FROM websphere-liberty:23.0.0.6-kernel-java17-openj9
-ARG VERBOSE=false
-
-# Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
-
 COPY --chown=1001:0 server.xml /config/
 
 # Create a new SCC layer
diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8
index 0b58a7f43..1b3b88a7e 100644
--- a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8
@@ -12,32 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibmjava:8-jre AS getRuntime
-
-USER root
-
-ARG VERBOSE=false
-
-# Install WebSphere Liberty
-ARG LIBERTY_VERSION=23.0.0.6
-ARG LIBERTY_URL
-ARG DOWNLOAD_OPTIONS=""
-
-# If there is a local copy of the image use that instead
-COPY resources/ /tmp/
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends unzip wget openssl \
-    && rm -rf /var/lib/apt/lists/* \
-    && 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 \
-    && unzip -q /tmp/wlp.zip -d /opt/ibm \
-    && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp \
-    && cp -a /opt/ibm/wlp/lafiles/. /licenses/
-
 FROM ibmjava:8-jre
 
 USER root
@@ -95,20 +69,27 @@ RUN set -eux; \
     curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init; \
-    apt-get purge --auto-remove -y wget; \
+    apt-get purge --auto-remove -y curl; \
     rm -rf /var/lib/apt/lists/*;
 
-# Add default user 1001 and create wlp with right user/permissions before copying
-RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && mkdir -p /opt/ibm/wlp \
-    && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp
-
-# Copy the runtime and licenses
-COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
-COPY --from=getRuntime /licenses /licenses
+# Install WebSphere Liberty
+ARG LIBERTY_URL
+ARG DOWNLOAD_OPTIONS=""
 
-RUN apt-get install -y --no-install-recommends openssl \
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends unzip wget openssl \
+    && rm -rf /var/lib/apt/lists/* \
+    && 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' )}  \
+    && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
+    && unzip -q /tmp/wlp.zip -d /opt/ibm \
+    && rm /tmp/wlp.zip \
+    && chown -R 1001:0 /opt/ibm/wlp \
+    && chmod -R g+rw /opt/ibm/wlp \
+    && cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
+    && apt-get purge --auto-remove -y unzip \
+    && apt-get purge --auto-remove -y wget \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11
index 4978eb1fa..968685e4b 100644
--- a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11
@@ -12,32 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-11-jre-focal AS getRuntime
-
-USER root
-
-ARG VERBOSE=false
-
-# Install WebSphere Liberty
-ARG LIBERTY_VERSION=23.0.0.6
-ARG LIBERTY_URL
-ARG DOWNLOAD_OPTIONS=""
-
-# If there is a local copy of the image use that instead
-COPY resources/ /tmp/
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends unzip wget openssl \
-    && rm -rf /var/lib/apt/lists/* \
-    && 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 \
-    && unzip -q /tmp/wlp.zip -d /opt/ibm \
-    && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp \
-    && cp -a /opt/ibm/wlp/lafiles/. /licenses/
-
 FROM ibm-semeru-runtimes:open-11-jre-focal
 
 USER root
@@ -94,17 +68,23 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
-# Add default user 1001 and create wlp with right user/permissions before copying
-RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && mkdir -p /opt/ibm/wlp \
+# Install WebSphere Liberty
+ARG LIBERTY_URL
+ARG DOWNLOAD_OPTIONS=""
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends unzip openssl wget \
+    && rm -rf /var/lib/apt/lists/* \
+    && 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' )}  \
+    && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
+    && unzip -q /tmp/wlp.zip -d /opt/ibm \
+    && rm /tmp/wlp.zip \
     && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp
-
-# Copy the runtime and licenses
-COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
-COPY --from=getRuntime /licenses /licenses
-
-RUN apt-get install -y --no-install-recommends openssl \
+    && chmod -R g+rw /opt/ibm/wlp \
+    && cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
+    && apt-get purge --auto-remove -y unzip \
+    && apt-get purge --auto-remove -y wget \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17
index 7fe7d2e8c..6c75686c2 100644
--- a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17
@@ -12,32 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-17-jre-focal AS getRuntime
-
-USER root
-
-ARG VERBOSE=false
-
-# Install WebSphere Liberty
-ARG LIBERTY_VERSION=23.0.0.6
-ARG LIBERTY_URL
-ARG DOWNLOAD_OPTIONS=""
-
-# If there is a local copy of the image use that instead
-COPY resources/ /tmp/
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends unzip wget openssl \
-    && rm -rf /var/lib/apt/lists/* \
-    && 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 \
-    && unzip -q /tmp/wlp.zip -d /opt/ibm \
-    && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp \
-    && cp -a /opt/ibm/wlp/lafiles/. /licenses/
-
 FROM ibm-semeru-runtimes:open-17-jre-focal
 
 USER root
@@ -94,17 +68,23 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
-# Add default user 1001 and create wlp with right user/permissions before copying
-RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && mkdir -p /opt/ibm/wlp \
+# Install WebSphere Liberty
+ARG LIBERTY_URL
+ARG DOWNLOAD_OPTIONS=""
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends unzip openssl wget \
+    && rm -rf /var/lib/apt/lists/* \
+    && 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' )}  \
+    && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
+    && unzip -q /tmp/wlp.zip -d /opt/ibm \
+    && rm /tmp/wlp.zip \
     && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp
-
-# Copy the runtime and licenses
-COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
-COPY --from=getRuntime /licenses /licenses
-
-RUN apt-get install -y --no-install-recommends openssl \
+    && chmod -R g+rw /opt/ibm/wlp \
+    && cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
+    && apt-get purge --auto-remove -y unzip \
+    && apt-get purge --auto-remove -y wget \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
diff --git a/ga/latest/full/Dockerfile.ubuntu.ibmjava8 b/ga/latest/full/Dockerfile.ubuntu.ibmjava8
index 395a6922a..229de6c9c 100644
--- a/ga/latest/full/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/full/Dockerfile.ubuntu.ibmjava8
@@ -12,38 +12,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel AS installBundle
+FROM websphere-liberty:kernel-java8-ibmjava
+
+USER root
+
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
-# If there is a local copy of the repository use that instead
-COPY resources/ /tmp/
-
 # Install the base bundle
 RUN set -eux; \
   if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     mkdir /opt/ibm/wlp/etc/; \
     echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
-    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  installUtility install --acceptLicense baseBundle; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     rm /opt/ibm/wlp/etc/repositories.properties; \
-  elif [ -f /tmp/wlpRepo.zip ]; then \
-    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
-  else \
-    installUtility install --acceptLicense baseBundle; \
   fi; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-FROM websphere-liberty:kernel
-ARG VERBOSE=false
-
-# Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
-
 COPY --chown=1001:0 server.xml /config/
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
     && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
     && find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx
-
diff --git a/ga/latest/full/Dockerfile.ubuntu.openjdk11 b/ga/latest/full/Dockerfile.ubuntu.openjdk11
index 02fd841cd..49439d852 100644
--- a/ga/latest/full/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/full/Dockerfile.ubuntu.openjdk11
@@ -12,37 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel-java11-openj9 AS installBundle
+FROM websphere-liberty:kernel-java11-openj9
 
 USER root
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
-# If there is a local copy of the repository use that instead
-COPY resources/ /tmp/
-
 # Install the base bundle
 RUN set -eux; \
   if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     mkdir /opt/ibm/wlp/etc/; \
     echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
-    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  installUtility install --acceptLicense baseBundle; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     rm /opt/ibm/wlp/etc/repositories.properties; \
-  elif [ -f /tmp/wlpRepo.zip ]; then \
-    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
-  else \
-    installUtility install --acceptLicense baseBundle; \
   fi; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-FROM websphere-liberty:kernel-java11-openj9
-ARG VERBOSE=false
-
-# Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
-
 COPY --chown=1001:0 server.xml /config/
 
 # Create a new SCC layer
diff --git a/ga/latest/full/Dockerfile.ubuntu.openjdk17 b/ga/latest/full/Dockerfile.ubuntu.openjdk17
index 1241066c1..d4b622462 100644
--- a/ga/latest/full/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/full/Dockerfile.ubuntu.openjdk17
@@ -12,37 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel-java17-openj9 AS installBundle
+FROM websphere-liberty:kernel-java17-openj9
 
 USER root
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
-# If there is a local copy of the repository use that instead
-COPY resources/ /tmp/
-
 # Install the base bundle
 RUN set -eux; \
   if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     mkdir /opt/ibm/wlp/etc/; \
     echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
-    installUtility install --acceptLicense baseBundle; \
+  fi; \
+  installUtility install --acceptLicense baseBundle; \
+  if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
     rm /opt/ibm/wlp/etc/repositories.properties; \
-  elif [ -f /tmp/wlpRepo.zip ]; then \
-    installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
-  else \
-    installUtility install --acceptLicense baseBundle; \
   fi; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-FROM websphere-liberty:kernel-java17-openj9
-ARG VERBOSE=false
-
-# Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
-
 COPY --chown=1001:0 server.xml /config/
 
 # Create a new SCC layer
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
index 0b58a7f43..1b3b88a7e 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -12,32 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibmjava:8-jre AS getRuntime
-
-USER root
-
-ARG VERBOSE=false
-
-# Install WebSphere Liberty
-ARG LIBERTY_VERSION=23.0.0.6
-ARG LIBERTY_URL
-ARG DOWNLOAD_OPTIONS=""
-
-# If there is a local copy of the image use that instead
-COPY resources/ /tmp/
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends unzip wget openssl \
-    && rm -rf /var/lib/apt/lists/* \
-    && 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 \
-    && unzip -q /tmp/wlp.zip -d /opt/ibm \
-    && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp \
-    && cp -a /opt/ibm/wlp/lafiles/. /licenses/
-
 FROM ibmjava:8-jre
 
 USER root
@@ -95,20 +69,27 @@ RUN set -eux; \
     curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init; \
-    apt-get purge --auto-remove -y wget; \
+    apt-get purge --auto-remove -y curl; \
     rm -rf /var/lib/apt/lists/*;
 
-# Add default user 1001 and create wlp with right user/permissions before copying
-RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && mkdir -p /opt/ibm/wlp \
-    && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp
-
-# Copy the runtime and licenses
-COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
-COPY --from=getRuntime /licenses /licenses
+# Install WebSphere Liberty
+ARG LIBERTY_URL
+ARG DOWNLOAD_OPTIONS=""
 
-RUN apt-get install -y --no-install-recommends openssl \
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends unzip wget openssl \
+    && rm -rf /var/lib/apt/lists/* \
+    && 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' )}  \
+    && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
+    && unzip -q /tmp/wlp.zip -d /opt/ibm \
+    && rm /tmp/wlp.zip \
+    && chown -R 1001:0 /opt/ibm/wlp \
+    && chmod -R g+rw /opt/ibm/wlp \
+    && cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
+    && apt-get purge --auto-remove -y unzip \
+    && apt-get purge --auto-remove -y wget \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index 4978eb1fa..968685e4b 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -12,32 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-11-jre-focal AS getRuntime
-
-USER root
-
-ARG VERBOSE=false
-
-# Install WebSphere Liberty
-ARG LIBERTY_VERSION=23.0.0.6
-ARG LIBERTY_URL
-ARG DOWNLOAD_OPTIONS=""
-
-# If there is a local copy of the image use that instead
-COPY resources/ /tmp/
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends unzip wget openssl \
-    && rm -rf /var/lib/apt/lists/* \
-    && 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 \
-    && unzip -q /tmp/wlp.zip -d /opt/ibm \
-    && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp \
-    && cp -a /opt/ibm/wlp/lafiles/. /licenses/
-
 FROM ibm-semeru-runtimes:open-11-jre-focal
 
 USER root
@@ -94,17 +68,23 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
-# Add default user 1001 and create wlp with right user/permissions before copying
-RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && mkdir -p /opt/ibm/wlp \
+# Install WebSphere Liberty
+ARG LIBERTY_URL
+ARG DOWNLOAD_OPTIONS=""
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends unzip openssl wget \
+    && rm -rf /var/lib/apt/lists/* \
+    && 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' )}  \
+    && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
+    && unzip -q /tmp/wlp.zip -d /opt/ibm \
+    && rm /tmp/wlp.zip \
     && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp
-
-# Copy the runtime and licenses
-COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
-COPY --from=getRuntime /licenses /licenses
-
-RUN apt-get install -y --no-install-recommends openssl \
+    && chmod -R g+rw /opt/ibm/wlp \
+    && cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
+    && apt-get purge --auto-remove -y unzip \
+    && apt-get purge --auto-remove -y wget \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index 7fe7d2e8c..6c75686c2 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -12,32 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-17-jre-focal AS getRuntime
-
-USER root
-
-ARG VERBOSE=false
-
-# Install WebSphere Liberty
-ARG LIBERTY_VERSION=23.0.0.6
-ARG LIBERTY_URL
-ARG DOWNLOAD_OPTIONS=""
-
-# If there is a local copy of the image use that instead
-COPY resources/ /tmp/
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends unzip wget openssl \
-    && rm -rf /var/lib/apt/lists/* \
-    && 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 \
-    && unzip -q /tmp/wlp.zip -d /opt/ibm \
-    && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp \
-    && cp -a /opt/ibm/wlp/lafiles/. /licenses/
-
 FROM ibm-semeru-runtimes:open-17-jre-focal
 
 USER root
@@ -94,17 +68,23 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
-# Add default user 1001 and create wlp with right user/permissions before copying
-RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
-    && mkdir -p /opt/ibm/wlp \
+# Install WebSphere Liberty
+ARG LIBERTY_URL
+ARG DOWNLOAD_OPTIONS=""
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends unzip openssl wget \
+    && rm -rf /var/lib/apt/lists/* \
+    && 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' )}  \
+    && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
+    && unzip -q /tmp/wlp.zip -d /opt/ibm \
+    && rm /tmp/wlp.zip \
     && chown -R 1001:0 /opt/ibm/wlp \
-    && chmod -R g+rw /opt/ibm/wlp
-
-# Copy the runtime and licenses
-COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
-COPY --from=getRuntime /licenses /licenses
-
-RUN apt-get install -y --no-install-recommends openssl \
+    && chmod -R g+rw /opt/ibm/wlp \
+    && cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
+    && apt-get purge --auto-remove -y unzip \
+    && apt-get purge --auto-remove -y wget \
     && rm -rf /var/lib/apt/lists/*
 
 # Set Path Shortcuts