diff --git a/ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8
index 56333ba65..117065353 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8
+++ b/ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8
@@ -15,8 +15,6 @@
 ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE AS installBundle
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
@@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
 # Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 
 COPY --chown=1001:0 server.xml /config/
 
diff --git a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.6/full/Dockerfile.ubi.openjdk11
index ccd5142e6..6327e6463 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk11
+++ b/ga/23.0.0.6/full/Dockerfile.ubi.openjdk11
@@ -15,8 +15,6 @@
 ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
@@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
 # Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 
 COPY --chown=1001:0 server.xml /config/
 
diff --git a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.6/full/Dockerfile.ubi.openjdk17
index 90c63a789..8a3db2b93 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk17
+++ b/ga/23.0.0.6/full/Dockerfile.ubi.openjdk17
@@ -15,8 +15,6 @@
 ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
@@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
 # Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 
 COPY --chown=1001:0 server.xml /config/
 
diff --git a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.6/full/Dockerfile.ubi.openjdk8
index 2ce3dc275..41abc3a15 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk8
+++ b/ga/23.0.0.6/full/Dockerfile.ubi.openjdk8
@@ -15,8 +15,6 @@
 ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
@@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
 # Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 
 COPY --chown=1001:0 server.xml /config/
 
diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
index 616d74d84..9eb122917 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
+++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8
@@ -14,8 +14,6 @@
 
 FROM websphere-liberty:23.0.0.6-kernel-java8-ibmjava
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
index 9f52f30b8..b1097a11b 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
+++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11
@@ -14,8 +14,6 @@
 
 FROM websphere-liberty:23.0.0.6-kernel-java11-openj9
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
index 4d269dfdc..f6a03f276 100644
--- a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
+++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17
@@ -14,8 +14,6 @@
 
 FROM websphere-liberty:23.0.0.6-kernel-java17-openj9
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/latest/full/Dockerfile.ubi.ibmjava8 b/ga/latest/full/Dockerfile.ubi.ibmjava8
index 2a2aef089..8323de579 100644
--- a/ga/latest/full/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/full/Dockerfile.ubi.ibmjava8
@@ -15,8 +15,6 @@
 ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE AS installBundle
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
@@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
 # Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 
 COPY --chown=1001:0 server.xml /config/
 
diff --git a/ga/latest/full/Dockerfile.ubi.openjdk11 b/ga/latest/full/Dockerfile.ubi.openjdk11
index 79f2900b0..8669e3adf 100644
--- a/ga/latest/full/Dockerfile.ubi.openjdk11
+++ b/ga/latest/full/Dockerfile.ubi.openjdk11
@@ -15,8 +15,6 @@
 ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
@@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
 # Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 
 COPY --chown=1001:0 server.xml /config/
 
diff --git a/ga/latest/full/Dockerfile.ubi.openjdk17 b/ga/latest/full/Dockerfile.ubi.openjdk17
index dc91e1978..e38227406 100644
--- a/ga/latest/full/Dockerfile.ubi.openjdk17
+++ b/ga/latest/full/Dockerfile.ubi.openjdk17
@@ -15,8 +15,6 @@
 ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
@@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
 # Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 
 COPY --chown=1001:0 server.xml /config/
 
diff --git a/ga/latest/full/Dockerfile.ubi.openjdk8 b/ga/latest/full/Dockerfile.ubi.openjdk8
index 1d700de48..0081f5719 100644
--- a/ga/latest/full/Dockerfile.ubi.openjdk8
+++ b/ga/latest/full/Dockerfile.ubi.openjdk8
@@ -15,8 +15,6 @@
 ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE AS installBundle
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
@@ -43,7 +41,7 @@ FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
 # Copy the runtime
-COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp
+COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
 
 COPY --chown=1001:0 server.xml /config/
 
diff --git a/ga/latest/full/Dockerfile.ubuntu.ibmjava8 b/ga/latest/full/Dockerfile.ubuntu.ibmjava8
index 229de6c9c..c301dfec2 100644
--- a/ga/latest/full/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/full/Dockerfile.ubuntu.ibmjava8
@@ -14,8 +14,6 @@
 
 FROM websphere-liberty:kernel-java8-ibmjava
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/latest/full/Dockerfile.ubuntu.openjdk11 b/ga/latest/full/Dockerfile.ubuntu.openjdk11
index 49439d852..305136390 100644
--- a/ga/latest/full/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/full/Dockerfile.ubuntu.openjdk11
@@ -14,8 +14,6 @@
 
 FROM websphere-liberty:kernel-java11-openj9
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/latest/full/Dockerfile.ubuntu.openjdk17 b/ga/latest/full/Dockerfile.ubuntu.openjdk17
index d4b622462..58d75c5a0 100644
--- a/ga/latest/full/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/full/Dockerfile.ubuntu.openjdk17
@@ -14,8 +14,6 @@
 
 FROM websphere-liberty:kernel-java17-openj9
 
-USER root
-
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""