diff --git a/jetson-agx-orin-devkit/Dockerfile b/jetson-agx-orin-devkit/Dockerfile
index ff49c0c..4b9860c 100644
--- a/jetson-agx-orin-devkit/Dockerfile
+++ b/jetson-agx-orin-devkit/Dockerfile
@@ -52,7 +52,7 @@ ENV UDEV=1
 RUN echo "#!/bin/bash" > /etc/X11/xinit/xserverrc \
    && echo "" >> /etc/X11/xinit/xserverrc \
    && echo 'exec /usr/bin/X -s 0 dpms' >> /etc/X11/xinit/xserverrc && \
-   echo 'rmmod nvidia_drm && rmmod nvidia_modeset && startxfce4' > /opt/startxfce.sh
+   echo 'modules=("nvidia_drm"); for module in "${modules[@]}"; do if lsmod | grep -q ${module} ; then echo "Found $module"; rmmod $module; fi; done; startxfce4;' > /opt/startxfce.sh
 
 ## If any apt packages install mesa-egl, it will overwrite the tegra-egl
 ## symlink and ld path, so the following command will ensure tegra-egl remains
diff --git a/jetson-orin-nano-devkit-nvme/Dockerfile b/jetson-orin-nano-devkit-nvme/Dockerfile
index 19d5869..6efcb39 100644
--- a/jetson-orin-nano-devkit-nvme/Dockerfile
+++ b/jetson-orin-nano-devkit-nvme/Dockerfile
@@ -52,7 +52,7 @@ ENV UDEV=1
 RUN echo "#!/bin/bash" > /etc/X11/xinit/xserverrc \
    && echo "" >> /etc/X11/xinit/xserverrc \
    && echo 'exec /usr/bin/X -s 0 dpms' >> /etc/X11/xinit/xserverrc && \
-   echo 'rmmod nvidia_drm && rmmod nvidia_modeset && startxfce4' > /opt/startxfce.sh
+   echo 'modules=("nvidia_drm" "nvidia_modeset"); for module in "${modules[@]}"; do if lsmod | grep -q ${module} ; then echo "Found $module"; rmmod $module; fi; done; startxfce4;' > /opt/startxfce.sh
 
 ## If any apt packages install mesa-egl, it will overwrite the tegra-egl
 ## symlink and ld path, so the following command will ensure tegra-egl remains
diff --git a/jetson-orin-nx-xavier-nx-devkit/Dockerfile b/jetson-orin-nx-xavier-nx-devkit/Dockerfile
index e0d123e..0383131 100644
--- a/jetson-orin-nx-xavier-nx-devkit/Dockerfile
+++ b/jetson-orin-nx-xavier-nx-devkit/Dockerfile
@@ -52,7 +52,7 @@ ENV UDEV=1
 RUN echo "#!/bin/bash" > /etc/X11/xinit/xserverrc \
    && echo "" >> /etc/X11/xinit/xserverrc \
    && echo 'exec /usr/bin/X -s 0 dpms' >> /etc/X11/xinit/xserverrc && \
-   echo 'rmmod nvidia_drm && rmmod nvidia_modeset && startxfce4' > /opt/startxfce.sh
+   echo 'modules=("nvidia_drm" "nvidia_modeset"); for module in "${modules[@]}"; do if lsmod | grep -q ${module} ; then echo "Found $module"; rmmod $module; fi; done; startxfce4;' > /opt/startxfce.sh
 
 ## If any apt packages install mesa-egl, it will overwrite the tegra-egl
 ## symlink and ld path, so the following command will ensure tegra-egl remains