diff --git a/Dockerfile b/Dockerfile
index b4351e0..77e33ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:trixie-slim
 
 ARG VERSION_ARG="0.0"
-ARG VERSION_VNC="1.5.0"
+ARG VERSION_VNC="1.6.0-beta"
 
 ARG DEBCONF_NOWARNINGS="yes"
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -34,7 +34,6 @@ RUN set -eu && \
     tar -xf /tmp/novnc.tar.gz -C /tmp/ && \
     cd "/tmp/noVNC-${VERSION_VNC}" && \
     mv app core vendor package.json *.html /usr/share/novnc && \
-    sed -i "s|UI\.initSetting('path', 'websockify')|UI.initSetting('path', window.location.pathname.replace(/[^/]*$/, '').substring(1) + 'websockify')|" /usr/share/novnc/app/ui.js && \
     unlink /etc/nginx/sites-enabled/default && \
     sed -i 's/^worker_processes.*/worker_processes 1;/' /etc/nginx/nginx.conf && \
     echo "$VERSION_ARG" > /run/version && \
@@ -46,7 +45,9 @@ ADD --chmod=664 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/i
 ADD --chmod=664 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/js/script.js /var/www/js/script.js
 ADD --chmod=664 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/css/style.css /var/www/css/style.css
 ADD --chmod=664 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/img/favicon.svg /var/www/img/favicon.svg
-ADD --chmod=744 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/nginx.conf /etc/nginx/sites-enabled/web.conf
+ADD --chmod=664 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/conf/defaults.json /usr/share/novnc
+ADD --chmod=664 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/conf/mandatory.json /usr/share/novnc
+ADD --chmod=744 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/conf/nginx.conf /etc/nginx/sites-enabled/web.conf
 
 VOLUME /storage
 EXPOSE 22 5900 8006
diff --git a/src/reset.sh b/src/reset.sh
index 27c1417..675c4ca 100644
--- a/src/reset.sh
+++ b/src/reset.sh
@@ -65,6 +65,7 @@ if [ -z "${CPU// /}" ] && grep -qi "model:" <<< "$CPI"; then
 fi
 
 CPU="${CPU// CPU/}"
+CPU="${CPU// 8 Core/}"
 CPU="${CPU// 16 Core/}"
 CPU="${CPU// 32 Core/}"
 CPU="${CPU// 64 Core/}"
@@ -245,6 +246,15 @@ hasDisk() {
   return 1
 }
 
+user="admin"
+pass="$user"
+
+[ -n "${USER:-}" ] && user="${USER:-}"
+[ -n "${PASS:-}" ] && pass="${PASS:-}"
+
+# Set password
+echo "$user:{PLAIN}$pass" > /etc/nginx/.htpasswd
+
 # Start webserver
 cp -r /var/www/* /run/shm
 html "Starting $APP for Docker..."