diff --git a/builder/dockerfile.ubuntu1804.deb.test b/builder/dockerfile.ubuntu1804.deb.test
index c436631..a656de6 100644
--- a/builder/dockerfile.ubuntu1804.deb.test
+++ b/builder/dockerfile.ubuntu1804.deb.test
@@ -47,7 +47,7 @@ RUN dpkg -i /tmp/*.deb; apt-get -yf install
 ### END CUSTOM STUFF ###
 
 RUN chown -R 1000:0 $HOME
-USER 1000:kasmvnc
+USER 1000:ssl-cert
 WORKDIR $HOME
 
 ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
diff --git a/builder/dockerfile.ubuntu2004.deb.test b/builder/dockerfile.ubuntu2004.deb.test
index c5e5632..ed573b1 100644
--- a/builder/dockerfile.ubuntu2004.deb.test
+++ b/builder/dockerfile.ubuntu2004.deb.test
@@ -47,7 +47,7 @@ RUN dpkg -i /tmp/*.deb; apt-get -yf install
 ### END CUSTOM STUFF ###
 
 RUN chown -R 1000:0 $HOME
-USER 1000:kasmvnc
+USER 1000:ssl-cert
 WORKDIR $HOME
 
 ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
diff --git a/builder/startup/vnc_startup.sh b/builder/startup/vnc_startup.sh
index 27e8f66..b2980ce 100755
--- a/builder/startup/vnc_startup.sh
+++ b/builder/startup/vnc_startup.sh
@@ -21,16 +21,15 @@ detect_www_dir() {
 
 detect_cert_location() {
   local tarball_cert="$HOME/.vnc/self.pem"
-  local package_cert="/etc/kasmvnc/server.pem"
+  local package_cert="/etc/ssl/certs/ssl-cert-snakeoil.pem"
+  local package_key="/etc/ssl/private/ssl-cert-snakeoil.key"
   local use_cert=
 
   if [[ -f "$package_cert" ]]; then
-    use_cert="$package_cert"
+    cert_option="-cert $package_cert -key $package_key"
   else
-    use_cert="$tarball_cert"
+    cert_option="-cert $tarball_cert"
   fi
-
-  cert_option="-cert $use_cert"
 }
 
 ## resolve_vnc_connection