diff --git a/Dockerfile b/Dockerfile
index 4f7de21..2da8e34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,9 +38,9 @@ RUN curl -sSfL 'https://bintray.com/tigervnc/stable/download_file?file_path=tige
 
 USER jovyan
 
-# Custom jupyter-server-proxy to load vnc_lite.html instead of /
+# Recent jupyter-server-proxy to load vnc_lite.html instead of /
 # https://github.com/jupyterhub/jupyter-server-proxy/pull/151
-RUN /opt/conda/bin/pip install https://github.com/manics/jupyter-server-proxy/archive/1f22ccf44abd7ab5f7b306d57b6adb1dc3190e8b.zip
+RUN /opt/conda/bin/pip install https://github.com/jupyterhub/jupyter-server-proxy/archive/0e67e1afd0bab1342443f13bd147a2f8c682e9e0.zip
 RUN conda install -y -q -c manics websockify=0.9.0
 
 ADD jupyter_notebook_config.py /home/jovyan/.jupyter/jupyter_notebook_config.py
@@ -76,12 +76,6 @@ RUN mkdir .java && \
 # https://developer.gnome.org/desktop-entry-spec/
 #COPY --chown=${NB_UID}:${NB_GID} *.desktop /home/jovyan/Desktop/
 COPY --chown=1000:100 *.desktop /home/jovyan/Desktop/
-# Configure default OMERO.insight server list
-#COPY --chown=${NB_UID}:${NB_GID} java_userPrefs .java/.userPrefs
-COPY --chown=1000:100 java_userPrefs .java/.userPrefs
 
 WORKDIR ${HOME}
 
-# Both these should work:
-# http://127.0.0.1:8888/desktop
-# http://localhost:5901/vnc.html
diff --git a/java_userPrefs/org/openmicroscopy/prefs.xml b/java_userPrefs/org/openmicroscopy/prefs.xml
deleted file mode 100644
index 8c1f77e..0000000
--- a/java_userPrefs/org/openmicroscopy/prefs.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
-<map MAP_XML_VERSION="1.0"/>
diff --git a/java_userPrefs/org/openmicroscopy/shoola/prefs.xml b/java_userPrefs/org/openmicroscopy/shoola/prefs.xml
deleted file mode 100644
index 8c1f77e..0000000
--- a/java_userPrefs/org/openmicroscopy/shoola/prefs.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
-<map MAP_XML_VERSION="1.0"/>
diff --git a/java_userPrefs/org/openmicroscopy/shoola/util/prefs.xml b/java_userPrefs/org/openmicroscopy/shoola/util/prefs.xml
deleted file mode 100644
index 8c1f77e..0000000
--- a/java_userPrefs/org/openmicroscopy/shoola/util/prefs.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
-<map MAP_XML_VERSION="1.0"/>
diff --git a/java_userPrefs/org/openmicroscopy/shoola/util/ui/login/prefs.xml b/java_userPrefs/org/openmicroscopy/shoola/util/ui/login/prefs.xml
deleted file mode 100644
index 4ae2bd7..0000000
--- a/java_userPrefs/org/openmicroscopy/shoola/util/ui/login/prefs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
-<map MAP_XML_VERSION="1.0">
-<entry key="omeroConnectionSpeed" value="0"/>
-<entry key="omeroServer" value="nightshade.openmicroscopy.org:4064,outreach.openmicroscopy.org:4064,idr.openmicroscopy.org:4064,demo.openmicroscopy.org:4064"/>
-<entry key="omeroTransferEncrypted" value="true"/>
-</map>
diff --git a/java_userPrefs/org/openmicroscopy/shoola/util/ui/prefs.xml b/java_userPrefs/org/openmicroscopy/shoola/util/ui/prefs.xml
deleted file mode 100644
index 8c1f77e..0000000
--- a/java_userPrefs/org/openmicroscopy/shoola/util/ui/prefs.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
-<map MAP_XML_VERSION="1.0"/>
diff --git a/java_userPrefs/org/prefs.xml b/java_userPrefs/org/prefs.xml
deleted file mode 100644
index 8c1f77e..0000000
--- a/java_userPrefs/org/prefs.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
-<map MAP_XML_VERSION="1.0"/>