diff --git a/Dockerfile b/Dockerfile
index 07615dd..3bec785 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,7 @@ RUN apt-get update && apt-get install -y \
     supervisor curl jq jc borgbackup/bookworm-backports openssh-server rsyslog && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN groupadd -g ${GID} borgwarehouse && useradd -m -u ${UID} -g ${GID} borgwarehouse
+RUN if ! getent group ${GID} ; then groupadd -g ${GID} borgwarehouse; fi && useradd -m -u ${UID} -g ${GID} borgwarehouse
 
 RUN cp /etc/ssh/moduli /home/borgwarehouse/
 
@@ -53,4 +53,4 @@ USER borgwarehouse
 
 EXPOSE 3000 22
 
-ENTRYPOINT ["./docker-bw-init.sh"]
\ No newline at end of file
+ENTRYPOINT ["./docker-bw-init.sh"]