diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
index d0c7ad4d7..4e919d2ac 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
+++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=websphere-liberty:23.0.0.6-kernel-java8-ibmjava
-FROM $PARENT_IMAGE AS installBundle
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:23.0.0.6-kernel-java8-ibmjava AS installBundle
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
@@ -35,8 +35,8 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=websphere-liberty:23.0.0.6-kernel-java8-ibmjava
-FROM $PARENT_IMAGE
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:23.0.0.6-kernel-java8-ibmjava
 ARG VERBOSE=false
 
 # Copy the runtime
diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
index bd997625a..56a35b272 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
+++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=websphere-liberty:23.0.0.6-kernel-java11-openj9
-FROM $PARENT_IMAGE AS installBundle
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:23.0.0.6-kernel-java11-openj9 AS installBundle
 
 USER root
 
@@ -38,8 +38,8 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=websphere-liberty:23.0.0.6-kernel-java11-openj9
-FROM $PARENT_IMAGE
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:23.0.0.6-kernel-java11-openj9
 ARG VERBOSE=false
 
 # Copy the runtime
diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
index aced28ad0..9588f34e2 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
+++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=websphere-liberty:23.0.0.6-kernel-java17-openj9
-FROM $PARENT_IMAGE AS installBundle
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:23.0.0.6-kernel-java17-openj9 AS installBundle
 
 USER root
 
@@ -38,8 +38,8 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=websphere-liberty:23.0.0.6-kernel-java17-openj9
-FROM $PARENT_IMAGE
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:23.0.0.6-kernel-java17-openj9
 ARG VERBOSE=false
 
 # Copy the runtime
diff --git a/ga/latest/full/Dockerfile.ubuntu.ibmjava8 b/ga/latest/full/Dockerfile.ubuntu.ibmjava8
index ab3f8ef37..c5a11bb2c 100644
--- a/ga/latest/full/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/full/Dockerfile.ubuntu.ibmjava8
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=websphere-liberty:kernel
-FROM $PARENT_IMAGE AS installBundle
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:kernel AS installBundle
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
@@ -35,8 +35,8 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=websphere-liberty:kernel
-FROM $PARENT_IMAGE
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:kernel
 ARG VERBOSE=false
 
 # Copy the runtime
diff --git a/ga/latest/full/Dockerfile.ubuntu.openjdk11 b/ga/latest/full/Dockerfile.ubuntu.openjdk11
index 59b760a4e..330db16fd 100644
--- a/ga/latest/full/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/full/Dockerfile.ubuntu.openjdk11
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=websphere-liberty:kernel-java11-openj9
-FROM $PARENT_IMAGE AS installBundle
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:kernel-java11-openj9 AS installBundle
 
 USER root
 
@@ -38,8 +38,8 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=websphere-liberty:kernel-java11-openj9
-FROM $PARENT_IMAGE
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:kernel-java11-openj9
 ARG VERBOSE=false
 
 # Copy the runtime
diff --git a/ga/latest/full/Dockerfile.ubuntu.openjdk17 b/ga/latest/full/Dockerfile.ubuntu.openjdk17
index 2be7d6e5c..71f61369f 100644
--- a/ga/latest/full/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/full/Dockerfile.ubuntu.openjdk17
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PARENT_IMAGE=websphere-liberty:kernel-java17-openj9
-FROM $PARENT_IMAGE AS installBundle
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:kernel-java17-openj9 AS installBundle
 
 USER root
 
@@ -38,8 +38,8 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=websphere-liberty:kernel-java17-openj9
-FROM $PARENT_IMAGE
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE:kernel-java17-openj9
 ARG VERBOSE=false
 
 # Copy the runtime