diff --git a/releases/23.0.0.12/full/Dockerfile.ubi.ibmjava8 b/releases/23.0.0.12/full/Dockerfile.ubi.ibmjava8
index 48c29a05..af2a1727 100644
--- a/releases/23.0.0.12/full/Dockerfile.ubi.ibmjava8
+++ b/releases/23.0.0.12/full/Dockerfile.ubi.ibmjava8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM's Java and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM's Java and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk11 b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk11
index 39d7cfb2..782f5268 100644
--- a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk11
+++ b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk11
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk17 b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk17
index 506ceeab..e8852e62 100644
--- a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk17
+++ b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk17
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk8 b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk8
index 66853744..f19b30c3 100644
--- a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk8
+++ b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk11 b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk11
index 86fa09a4..1b54a406 100644
--- a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk11
+++ b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk11
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk17 b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk17
index 9c877654..1b42ecd4 100644
--- a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk17
+++ b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk17
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk8 b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk8
index dc5dd87a..9ad909de 100644
--- a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk8
+++ b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk8
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8
index 9e33c726..7e9c3919 100644
--- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8
+++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM's Java and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM's Java and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11
index 3f591855..42724be6 100644
--- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11
+++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17
index a07b50e9..7f525fb5 100644
--- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17
+++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8
index 22917861..bfc43d0e 100644
--- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8
+++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11
index 54041c34..1fac2f14 100644
--- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11
+++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17
index f7c3143a..99bc4c8f 100644
--- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17
+++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8
index b9047363..850642b6 100644
--- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8
+++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.9/full/Dockerfile.ubi.ibmjava8 b/releases/23.0.0.9/full/Dockerfile.ubi.ibmjava8
index b30bf556..310a83b5 100644
--- a/releases/23.0.0.9/full/Dockerfile.ubi.ibmjava8
+++ b/releases/23.0.0.9/full/Dockerfile.ubi.ibmjava8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM's Java and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM's Java and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk11 b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk11
index 8ae984ba..71927a96 100644
--- a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk11
+++ b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk11
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk17 b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk17
index 7bced029..a2f67290 100644
--- a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk17
+++ b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk17
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk8 b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk8
index 052a7971..6d8f73a4 100644
--- a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk8
+++ b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk11
index 14bf263c..d1f50e72 100644
--- a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk11
+++ b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk11
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk17
index b708e3bf..a8d95046 100644
--- a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk17
+++ b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk17
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk8 b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk8
index bdbc636a..96077f91 100644
--- a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk8
+++ b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk8
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8
index 18c7ac43..def21a48 100644
--- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8
+++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM's Java and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM's Java and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11
index b5736dbc..b50fe696 100644
--- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11
+++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17
index 98272e51..0ab12d5b 100644
--- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17
+++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8
index c5684cd4..64c77921 100644
--- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8
+++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11
index f66810a1..151b33d9 100644
--- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11
+++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17
index a74562bd..f521e495 100644
--- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17
+++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8
index 6b864457..65fbc986 100644
--- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8
+++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/latest/beta/Dockerfile.ubi.openjdk17 b/releases/latest/beta/Dockerfile.ubi.openjdk17
index b1aa7c9a..65be4605 100644
--- a/releases/latest/beta/Dockerfile.ubi.openjdk17
+++ b/releases/latest/beta/Dockerfile.ubi.openjdk17
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty Beta" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty Beta with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty Beta" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty Beta with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/latest/beta/Dockerfile.ubuntu.openjdk11 b/releases/latest/beta/Dockerfile.ubuntu.openjdk11
index d341cdd9..06a2cc51 100644
--- a/releases/latest/beta/Dockerfile.ubuntu.openjdk11
+++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk11
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty Beta" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty Beta" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/latest/beta/Dockerfile.ubuntu.openjdk17 b/releases/latest/beta/Dockerfile.ubuntu.openjdk17
index cb72c034..bef7ac40 100644
--- a/releases/latest/beta/Dockerfile.ubuntu.openjdk17
+++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk17
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty Beta" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty Beta" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/latest/beta/Dockerfile.ubuntu.openjdk8 b/releases/latest/beta/Dockerfile.ubuntu.openjdk8
index b038b314..78ef30e3 100644
--- a/releases/latest/beta/Dockerfile.ubuntu.openjdk8
+++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk8
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 8 with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty Beta" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 8 with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty Beta" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/latest/full/Dockerfile.ubi.ibmjava8 b/releases/latest/full/Dockerfile.ubi.ibmjava8
index 48c29a05..af2a1727 100644
--- a/releases/latest/full/Dockerfile.ubi.ibmjava8
+++ b/releases/latest/full/Dockerfile.ubi.ibmjava8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM's Java and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM's Java and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/latest/full/Dockerfile.ubi.openjdk11 b/releases/latest/full/Dockerfile.ubi.openjdk11
index 39d7cfb2..782f5268 100644
--- a/releases/latest/full/Dockerfile.ubi.openjdk11
+++ b/releases/latest/full/Dockerfile.ubi.openjdk11
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/latest/full/Dockerfile.ubi.openjdk17 b/releases/latest/full/Dockerfile.ubi.openjdk17
index 506ceeab..e8852e62 100644
--- a/releases/latest/full/Dockerfile.ubi.openjdk17
+++ b/releases/latest/full/Dockerfile.ubi.openjdk17
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/latest/full/Dockerfile.ubi.openjdk8 b/releases/latest/full/Dockerfile.ubi.openjdk8
index 66853744..f19b30c3 100644
--- a/releases/latest/full/Dockerfile.ubi.openjdk8
+++ b/releases/latest/full/Dockerfile.ubi.openjdk8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/latest/full/Dockerfile.ubuntu.openjdk11 b/releases/latest/full/Dockerfile.ubuntu.openjdk11
index 86fa09a4..1b54a406 100644
--- a/releases/latest/full/Dockerfile.ubuntu.openjdk11
+++ b/releases/latest/full/Dockerfile.ubuntu.openjdk11
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/latest/full/Dockerfile.ubuntu.openjdk17 b/releases/latest/full/Dockerfile.ubuntu.openjdk17
index 9c877654..1b42ecd4 100644
--- a/releases/latest/full/Dockerfile.ubuntu.openjdk17
+++ b/releases/latest/full/Dockerfile.ubuntu.openjdk17
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/latest/full/Dockerfile.ubuntu.openjdk8 b/releases/latest/full/Dockerfile.ubuntu.openjdk8
index dc5dd87a..9ad909de 100644
--- a/releases/latest/full/Dockerfile.ubuntu.openjdk8
+++ b/releases/latest/full/Dockerfile.ubuntu.openjdk8
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8
index 9e33c726..7e9c3919 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8
+++ b/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM's Java and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM's Java and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11
index 3f591855..42724be6 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11
+++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17
index a07b50e9..7f525fb5 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17
+++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8
index 22917861..bfc43d0e 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8
+++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8
@@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.version="$LIBERTY_VERSION" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      vendor="Open Liberty" \
-      name="Open Liberty" \
-      version="$LIBERTY_VERSION" \
-      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
-      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -79,6 +67,18 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.version="$LIBERTY_VERSION" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      vendor="Open Liberty" \
+      name="Open Liberty" \
+      version="$LIBERTY_VERSION" \
+      summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \
+      description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS.  For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image"
+
 # Add default user 1001 and create wlp with right user/permissions before copying
 RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
     && mkdir -p /opt/ol/wlp \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11
index 54041c34..1fac2f14 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11
+++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17
index f7c3143a..99bc4c8f 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17
+++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \
diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8
index b9047363..850642b6 100644
--- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8
+++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8
@@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
-      org.opencontainers.image.vendor="Open Liberty" \
-      org.opencontainers.image.url="https://openliberty.io/" \
-      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
-      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
-      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
-      org.opencontainers.image.title="Open Liberty" \
-      org.opencontainers.image.version="$LIBERTY_VERSION"
-
 COPY NOTICES /opt/ol/NOTICES
 COPY helpers /opt/ol/helpers
 COPY fixes/ /opt/ol/fixes/
@@ -52,6 +43,15 @@ RUN set -eux; \
     echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \
     chmod +x /usr/bin/dumb-init;
 
+LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \
+      org.opencontainers.image.vendor="Open Liberty" \
+      org.opencontainers.image.url="https://openliberty.io/" \
+      org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
+      org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \
+      org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \
+      org.opencontainers.image.title="Open Liberty" \
+      org.opencontainers.image.version="$LIBERTY_VERSION"
+
 # Install Open Liberty
 RUN apt-get update \
     && apt-get install -y --no-install-recommends unzip openssl wget \