diff --git a/Fedora-35/fedora35_dev_entrypoint.sh b/Fedora-35/fedora35_dev_entrypoint.sh
index 9ddb9e6..90fb9f4 100755
--- a/Fedora-35/fedora35_dev_entrypoint.sh
+++ b/Fedora-35/fedora35_dev_entrypoint.sh
@@ -40,7 +40,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
 groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
 #
 # - Add the user.
-useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
+useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
   -G wheel -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
 
 echo "${EDK2_DOCKER_USER}":tianocore | chpasswd
diff --git a/Fedora-37/fedora37_dev_entrypoint.sh b/Fedora-37/fedora37_dev_entrypoint.sh
index 480f548..d670211 100755
--- a/Fedora-37/fedora37_dev_entrypoint.sh
+++ b/Fedora-37/fedora37_dev_entrypoint.sh
@@ -39,7 +39,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
 groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
 #
 # - Add the user.
-useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
+useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
   -G wheel -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
 
 echo "${EDK2_DOCKER_USER}":tianocore | chpasswd
diff --git a/Fedora-39/fedora39_dev_entrypoint.sh b/Fedora-39/fedora39_dev_entrypoint.sh
index 480f548..d670211 100755
--- a/Fedora-39/fedora39_dev_entrypoint.sh
+++ b/Fedora-39/fedora39_dev_entrypoint.sh
@@ -39,7 +39,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
 groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
 #
 # - Add the user.
-useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
+useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
   -G wheel -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
 
 echo "${EDK2_DOCKER_USER}":tianocore | chpasswd
diff --git a/Ubuntu-20/ubuntu20_dev_entrypoint.sh b/Ubuntu-20/ubuntu20_dev_entrypoint.sh
index 52644cf..48a20cd 100755
--- a/Ubuntu-20/ubuntu20_dev_entrypoint.sh
+++ b/Ubuntu-20/ubuntu20_dev_entrypoint.sh
@@ -43,7 +43,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
 groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
 #
 # - Add the user.
-useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
+useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
   -G sudo -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
 
 echo "${EDK2_DOCKER_USER}":tianocore | chpasswd
diff --git a/Ubuntu-22/ubuntu22_dev_entrypoint.sh b/Ubuntu-22/ubuntu22_dev_entrypoint.sh
index fc057d2..2297dfd 100755
--- a/Ubuntu-22/ubuntu22_dev_entrypoint.sh
+++ b/Ubuntu-22/ubuntu22_dev_entrypoint.sh
@@ -42,7 +42,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
 groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
 #
 # - Add the user.
-useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
+useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
   -G sudo -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
 
 echo "${EDK2_DOCKER_USER}":tianocore | chpasswd