diff --git a/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in b/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in
index f1a57f5..99b6226 100644
--- a/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in
+++ b/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in
@@ -23,7 +23,10 @@ FROM ubuntu:rolling
 
 RUN groupadd -r wheel
 
-# `dev-tools` user
+# Remove default `ubuntu` user which may conflict with host user's UID/GID (1000:1000)
+RUN userdel -r ubuntu
+
+# Add `dev-tools` user
 RUN useradd -m -s /bin/bash @DOCKER_FINANCE_USER@ -u @DOCKER_FINANCE_UID@
 RUN gpasswd -a @DOCKER_FINANCE_USER@ wheel
 
diff --git a/client/Dockerfiles/finance/Dockerfile.ubuntu.in b/client/Dockerfiles/finance/Dockerfile.ubuntu.in
index 1f7b76e..45e9aff 100644
--- a/client/Dockerfiles/finance/Dockerfile.ubuntu.in
+++ b/client/Dockerfiles/finance/Dockerfile.ubuntu.in
@@ -23,7 +23,10 @@ FROM ubuntu:rolling
 
 RUN groupadd -r wheel
 
-# `finance` user
+# Remove default `ubuntu` user which may conflict with host user's UID/GID (1000:1000)
+RUN userdel -r ubuntu
+
+# Add `finance` user
 RUN useradd -m -s /bin/bash @DOCKER_FINANCE_USER@ -u @DOCKER_FINANCE_UID@
 
 # System-level user for building (won't pollute user-level UID space)