diff --git a/dockerfile-kasm-core-gpu b/dockerfile-kasm-core-gpu
index 16a30cd..8e71bc8 100644
--- a/dockerfile-kasm-core-gpu
+++ b/dockerfile-kasm-core-gpu
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE="nvidia/opengl:1.2-glvnd-runtime-ubuntu18.04"
+ARG BASE_IMAGE="nvidia/opengl:1.2-glvnd-runtime-ubuntu20.04"
 FROM $BASE_IMAGE AS install_tools
 ARG DISTRO=ubuntu
 
diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh
index 0e7932c..30d40c7 100644
--- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh
+++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh
@@ -9,7 +9,8 @@ then
 elif [ "${DISTRO}" == "centos" ] ; then
     BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/bcad19542e02921f1f275532cc7854559d737cb5/output/centos_core/kasmvncserver-0.9.1~beta-1.el7.x86_64.rpm"
 else
-    BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/bcad19542e02921f1f275532cc7854559d737cb5/kasmvncserver_bionic_0.9.3_master_bcad19_amd64.deb"
+    UBUNTU_CODENAME=$(grep -Po -m 1 "(?<=_CODENAME=)\w+" /etc/os-release)
+    BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/bcad19542e02921f1f275532cc7854559d737cb5/kasmvncserver_${UBUNTU_CODENAME}_0.9.3_master_bcad19_amd64.deb"
 fi