diff --git a/entrypoint.sh b/entrypoint.sh
index e0be5f0..3ec55bc 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -6,9 +6,17 @@ PGID=${PGID:-1001}
 
 # Only remap if the requested IDs differ from the defaults baked into the image
 if [ "$PGID" != "1001" ]; then
+  existing_group=$(getent group "$PGID" | cut -d: -f1)
+  if [ -n "$existing_group" ] && [ "$existing_group" != "nodejs" ]; then
+    groupdel "$existing_group"
+  fi
   groupmod -g "$PGID" nodejs
 fi
 if [ "$PUID" != "1001" ]; then
+  existing_user=$(getent passwd "$PUID" | cut -d: -f1)
+  if [ -n "$existing_user" ] && [ "$existing_user" != "nextjs" ]; then
+    userdel "$existing_user"
+  fi
   usermod -u "$PUID" nextjs
 fi