diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9
index 6e44f03f6d2..2a287f38fa0 100644
--- a/utils/docker/Dockerfile.el.9
+++ b/utils/docker/Dockerfile.el.9
@@ -84,9 +84,9 @@ RUN --mount=type=bind,source=utils/scripts/install-el9.sh,target=/tmp/daos/insta
     dnf clean all
 
 # Add DAOS user
-ARG UID=1000
+ARG DAOS_SERVER_UID=1000
 RUN --mount=type=bind,source=utils/scripts/helpers/daos-server-user-setup.sh,target=/tmp/daos/daos-server-user-setup.sh \
-    /tmp/daos/daos-server-user-setup.sh
+    /tmp/daos/daos-server-user-setup.sh;
 
 # Create directory for DAOS build backend storage
 RUN mkdir -p /home/daos /opt/daos && \
diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15
index 621faa8f2d0..00d33a051a8 100644
--- a/utils/docker/Dockerfile.leap.15
+++ b/utils/docker/Dockerfile.leap.15
@@ -100,9 +100,9 @@ RUN if [ -n "$JENKINS_URL" ]; then \
     fi
     
 # Add DAOS users
-ARG UID=1000
+ARG DAOS_SERVER_UID=1000
 RUN --mount=type=bind,source=utils/scripts/helpers/daos-server-user-setup.sh,target=/tmp/daos/daos-server-user-setup.sh \
-    /tmp/daos/daos-server-user-setup.sh
+    /tmp/daos/daos-server-user-setup.sh;
 
 # Create directory for DAOS build backend storage
 RUN mkdir -p /home/daos /opt/daos && \
diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu
index d27665b015e..ca70b6d9377 100644
--- a/utils/docker/Dockerfile.ubuntu
+++ b/utils/docker/Dockerfile.ubuntu
@@ -64,12 +64,13 @@ RUN update-alternatives --set \
     java /usr/lib/jvm/java-8-openjdk-*/jre/bin/java
 
 # Add DAOS users
-ARG UID=5000
+ARG DAOS_SERVER_UID=5000
 COPY ./utils/scripts/helpers/daos-server-user-setup.sh \
      /tmp/daos-server-user-setup.sh
-RUN set -e;                                    \
-    chmod +x /tmp/daos-server-user-setup.sh && \
-    /tmp/daos-server-user-setup.sh
+RUN set -e;                                     \
+    chmod +x /tmp/daos-server-user-setup.sh;    \
+        /tmp/daos-server-user-setup.sh;
+
 RUN useradd --no-log-init --user-group --create-home --shell /bin/bash daos_agent
 RUN echo "daos_agent:daos_agent" | chpasswd