diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 8ce8c14..e6ddb16 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -8,13 +8,23 @@ ARG USERNAME=user
 
 WORKDIR /workspaces
 
+# Delete existing user if it exists
+RUN if getent passwd ${USER_UID}; then \
+    userdel -r $(getent passwd ${USER_UID} | cut -d: -f1); \
+    fi
+
+# Delete existing group if it exists
+RUN if getent group ${USER_GID}; then \
+    groupdel $(getent group ${USER_GID} | cut -d: -f1); \
+    fi
+
 RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
-    && mkdir -p -m 0700 /run/user/"${USER_UID}" \
-    && mkdir -p -m 0700 /run/user/"${USER_UID}"/gdm \
-    && chown user:user /run/user/"${USER_UID}" \
-    && chown user:user /workspaces \
-    && chown user:user /run/user/"${USER_UID}"/gdm 
+  && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
+  && mkdir -p -m 0700 /run/user/"${USER_UID}" \
+  && mkdir -p -m 0700 /run/user/"${USER_UID}"/gdm \
+  && chown $USERNAME:$USERNAME /run/user/"${USER_UID}" \
+  && chown $USERNAME:$USERNAME /workspaces \
+  && chown $USERNAME:$USERNAME /run/user/"${USER_UID}"/gdm
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \