diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8004719..339e46d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -403,18 +403,10 @@ RUN sed -i 's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.co
   echo needs_root_rights=yes >> /etc/X11/Xwrapper.config && \
   chmod u+s /usr/bin/xinit
 
-# Create the docker group with the host os group id, backing up any existing group with docker group id
-ENV DOCKER_GROUP 999
-RUN getent group $DOCKER_GROUP | \
-  grep -v docker | \
-  cut -d: -f1 | \
-  xargs groupmod --gid 9999 2>/dev/null || true
-RUN groupmod --gid $DOCKER_GROUP docker
-
 # Create a non-root user for safe operation
 RUN useradd \
   --create-home \
-  --groups $DOCKER_GROUP,audio,chrome,input,netdev,shadow,sudo,tty,video \
+  --groups audio,chrome,docker,input,netdev,shadow,sudo,tty,video \
   --shell /bin/zsh \
   $USER
 
diff --git a/docker/scripts/test.sh b/docker/scripts/test.sh
index 34bf62d..da6eedf 100755
--- a/docker/scripts/test.sh
+++ b/docker/scripts/test.sh
@@ -23,4 +23,5 @@ until docker inspect $DESKTOP_ENVIRONMENT_CONTAINER_NAME | grep Status | grep -m
 # Start the desktop environment inside the container
 $REPO_ROOT/docker/scripts/exec.sh /home/$DESKTOP_ENVIRONMENT_USER/.config/scripts/vnc.sh
 
-#
+# Check desktop environment started successfully
+curl --silent localhost | grep -iq vnc