diff --git a/Dockerfile.m4 b/Dockerfile.m4
index 15cf25e..da29eba 100644
--- a/Dockerfile.m4
+++ b/Dockerfile.m4
@@ -134,7 +134,7 @@ RUN dpkg -i ./libjpeg-turbo32_*.deb
 ]])m4_dnl
 
 # Build VirtualGL
-ARG VIRTUALGL_TREEISH=3.0.1
+ARG VIRTUALGL_TREEISH=3.0.2
 ARG VIRTUALGL_REMOTE=https://github.com/VirtualGL/virtualgl.git
 RUN mkdir /tmp/virtualgl/
 WORKDIR /tmp/virtualgl/
@@ -612,4 +612,4 @@ EXPOSE 3322/tcp
 # Expose RDP port
 EXPOSE 3389/tcp
 
-ENTRYPOINT ["/usr/local/bin/container-init"]
+ENTRYPOINT ["/usr/bin/catatonit", "--", "/usr/local/bin/container-init"]
diff --git a/scripts/bin/container-init b/scripts/bin/container-init
index 819b24e..c983b78 100755
--- a/scripts/bin/container-init
+++ b/scripts/bin/container-init
@@ -126,4 +126,4 @@ openssl x509 -in "${XRDP_TLS_CRT_PATH:?}" -noout -fingerprint -sha256
 env | grep -Ev '^(PWD|OLDPWD|HOME|USER|SHELL|TERM|([^=]*(PASSWORD|SECRET)[^=]*))=' | sort > /etc/environment
 
 # Start runit
-exec catatonit -- runsvdir -P /etc/service/
+exec runsvdir -P /etc/service/