diff --git a/builder/build-deb b/builder/build-deb
index 4ee7c40..b63f0b5 100755
--- a/builder/build-deb
+++ b/builder/build-deb
@@ -4,8 +4,10 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-docker build -t debbuilder_ubuntu:18.04 -f \
+sudo docker build -t debbuilder_ubuntu:18.04 -f \
   builder/dockerfile.ubuntu1804.deb.build .
 
 deb_output_dir=$(cd .. && echo $PWD)
-docker run --rm -v "$deb_output_dir":/src debbuilder_ubuntu:18.04 /bin/bash -c '/src/*/builder/build-deb-inside-docker'
+L_UID=$(id -u) #Ubuntu already has UID env var, but this should work on all Linix systems
+L_GID=$(id -g)
+sudo docker run --rm -v "$deb_output_dir":/src --user $L_UID:$L_GID debbuilder_ubuntu:18.04 /bin/bash -c '/src/*/builder/build-deb-inside-docker'
diff --git a/builder/build-tarball b/builder/build-tarball
index e4a9293..d0ee4e5 100755
--- a/builder/build-tarball
+++ b/builder/build-tarball
@@ -4,7 +4,12 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-docker pull ubuntu:18.04
-docker build -t kasmvncbuilder:18.04 -f builder/dockerfile.ubuntu1804.build .
+sudo docker pull ubuntu:18.04
+sudo docker build -t kasmvncbuilder:18.04 -f builder/dockerfile.ubuntu1804.build .
 mkdir -p builder/build
-docker run -v ${PWD}/builder/build:/build --rm kasmvncbuilder:18.04
+sudo docker run -v /tmp:/build --rm kasmvncbuilder:18.04
+
+L_GID=$(id -g)
+L_UID=$(id -u)
+sudo chown $L_UID:$L_GID /tmp/kasmvnc.ubuntu_18.04.tar.gz
+mv /tmp/kasmvnc.ubuntu_18.04.tar.gz $PWD/builder/build/
diff --git a/builder/test-deb b/builder/test-deb
index 33ea333..231b9ee 100755
--- a/builder/test-deb
+++ b/builder/test-deb
@@ -5,4 +5,4 @@ set -e
 cd "$(dirname "$0")"
 
 docker build -t kasmvnctester-deb:18.04 -f dockerfile.ubuntu1804.deb.test .
-docker run -it -p 443:8443 --rm -e "VNC_USER=username" -e "VNC_PW=password123" kasmvnctester-deb:18.04
+#docker run -it -p 443:8443 --rm -e "VNC_USER=username" -e "VNC_PW=password123" kasmvnctester-deb:18.04
diff --git a/unix/vncserver b/unix/vncserver
index c56ea7e..c19fd3e 100644
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -276,7 +276,7 @@ $passwordArgSpecified = 0;
 #}
 
 # Disable vnc auth, kasmvnc uses https basic auth
-system("echo '' | ".$exedir."vncpasswd -f > $vncUserDir/passwd");
+system("echo 'WrLNwLrcrxM=' | base64 -d > $vncUserDir/passwd");
 
 $kasmAuthEnabled = 1;