diff --git a/Dockerfile.m4 b/Dockerfile.m4
index 3055ac5..48238ae 100644
--- a/Dockerfile.m4
+++ b/Dockerfile.m4
@@ -130,23 +130,23 @@ RUN dpkg -i --force-architecture ./virtualgl32_*.deb
 ]])m4_dnl
 
 # Build TurboVNC
-ARG TURBOVNC_TREEISH=2.2.2
-ARG TURBOVNC_REMOTE=https://github.com/TurboVNC/turbovnc.git
-WORKDIR /tmp/turbovnc/
-RUN git clone "${TURBOVNC_REMOTE:?}" ./
-RUN git checkout "${TURBOVNC_TREEISH:?}"
-RUN git submodule update --init --recursive
-WORKDIR ./build/
-RUN cmake ./ \
-		-G 'Unix Makefiles' \
-		-D PKGNAME=turbovnc \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_INSTALL_PREFIX=/opt/TurboVNC \
-		-D CMAKE_POSITION_INDEPENDENT_CODE=1 \
-		-D TVNC_BUILDJAVA=0 \
-		../
-RUN make -j"$(nproc)" && make deb
-RUN dpkg -i --force-architecture ./turbovnc_*.deb
+#ARG TURBOVNC_TREEISH=
+#ARG TURBOVNC_REMOTE=https://github.com/TurboVNC/turbovnc.git
+#WORKDIR /tmp/turbovnc/
+#RUN git clone "${TURBOVNC_REMOTE:?}" ./
+#RUN git checkout "${TURBOVNC_TREEISH:?}"
+#RUN git submodule update --init --recursive
+#WORKDIR ./build/
+#RUN cmake ./ \
+#		-G 'Unix Makefiles' \
+#		-D PKGNAME=turbovnc \
+#		-D CMAKE_BUILD_TYPE=Release \
+#		-D CMAKE_INSTALL_PREFIX=/opt/TurboVNC \
+#		-D CMAKE_POSITION_INDEPENDENT_CODE=1 \
+#		-D TVNC_BUILDJAVA=0 \
+#		../
+#RUN make -j"$(nproc)" && make deb
+#RUN dpkg -i --force-architecture ./turbovnc_*.deb
 
 # Build XRDP
 ARG XRDP_TREEISH=v0.9.11
@@ -371,9 +371,9 @@ COPY --from=build --chown=root:root /tmp/virtualgl/build32/virtualgl32_*.deb /tm
 RUN dpkg -i --force-architecture /tmp/virtualgl32.deb && rm -f /tmp/virtualgl32.deb
 ]])m4_dnl
 
-# Install TurboVNC from package
-COPY --from=build --chown=root:root /tmp/turbovnc/build/turbovnc_*.deb /tmp/turbovnc.deb
-RUN dpkg -i --force-architecture /tmp/turbovnc.deb && rm -f /tmp/turbovnc.deb
+## Install TurboVNC from package
+#COPY --from=build --chown=root:root /tmp/turbovnc/build/turbovnc_*.deb /tmp/turbovnc.deb
+#RUN dpkg -i --force-architecture /tmp/turbovnc.deb && rm -f /tmp/turbovnc.deb
 
 # Install XRDP from package
 COPY --from=build --chown=root:root /tmp/xrdp/xrdp_*.deb /tmp/xrdp.deb
@@ -397,7 +397,8 @@ ENV UNPRIVILEGED_USER_SHELL=/bin/bash
 ENV DISABLE_GPU=false
 ENV RDP_TLS_KEY_PATH=/etc/xrdp/key.pem
 ENV RDP_TLS_CERT_PATH=/etc/xrdp/cert.pem
-ENV PATH=/opt/VirtualGL/bin:/opt/TurboVNC/bin:${PATH}
+ENV PATH=/opt/VirtualGL/bin:${PATH}
+#ENV PATH=/opt/TurboVNC/bin:${PATH}
 ENV VGL_DISPLAY=:0
 ## Workaround for AMDGPU X_GLXCreatePbuffer issue:
 ## https://github.com/VirtualGL/virtualgl/issues/85#issuecomment-480291529
diff --git a/config/xrdp/sesman.ini b/config/xrdp/sesman.ini
index 82891ba..09c8332 100644
--- a/config/xrdp/sesman.ini
+++ b/config/xrdp/sesman.ini
@@ -33,14 +33,14 @@ param=-noreset
 param=-nolisten
 param=tcp
 
-[Xvnc]
-param=/opt/TurboVNC/bin/Xvnc
-param=-bs
-param=-nolisten
-param=tcp
-param=-localhost
-param=-dpi
-param=96
+;[Xvnc]
+;param=/opt/TurboVNC/bin/Xvnc
+;param=-bs
+;param=-nolisten
+;param=tcp
+;param=-localhost
+;param=-dpi
+;param=96
 
 [Chansrv]
 FuseMountName=.thinclient_drives
diff --git a/config/xrdp/xrdp.ini b/config/xrdp/xrdp.ini
index f2b1d02..b0c319f 100644
--- a/config/xrdp/xrdp.ini
+++ b/config/xrdp/xrdp.ini
@@ -67,10 +67,10 @@ ip=127.0.0.1
 port=-1
 code=20
 
-[Xvnc]
-name=Xvnc
-lib=libvnc.so
-username=ask
-password=ask
-ip=127.0.0.1
-port=-1
+;[Xvnc]
+;name=Xvnc
+;lib=libvnc.so
+;username=ask
+;password=ask
+;ip=127.0.0.1
+;port=-1