diff --git a/Dockerfile b/Dockerfile
index 3caa2b6b6..6a6492d5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # devel needed for bitsandbytes requirement of libcudart.so, otherwise runtime sufficient
-FROM nvidia/cuda:12.1.1-cudnn8-devel-ubuntu20.04
+FROM nvidia/cuda:12.1.1-cudnn8-devel-ubuntu22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/docker_build_script_ubuntu.sh b/docker_build_script_ubuntu.sh
index 2a7745f82..77029433b 100755
--- a/docker_build_script_ubuntu.sh
+++ b/docker_build_script_ubuntu.sh
@@ -128,12 +128,14 @@ rm -rf /workspace/notebooks
 rm -rf /workspace/papers
 
 # Hotswap vulnerable dependencies
-wget https://s3.amazonaws.com/artifacts.h2o.ai/deps/h2ogpt/ubuntu20.04/apparmor_4.0.0~alpha2-0ubuntu5_amd64.deb
-wget https://s3.amazonaws.com/artifacts.h2o.ai/deps/h2ogpt/ubuntu20.04/libapparmor1_4.0.0~alpha2-0ubuntu5_amd64.deb
+wget https://s3.amazonaws.com/artifacts.h2o.ai/deps/h2ogpt/apparmor_4.0.0~alpha2-0ubuntu5_amd64.deb
+wget https://s3.amazonaws.com/artifacts.h2o.ai/deps/h2ogpt/libapparmor1_4.0.0~alpha2-0ubuntu5_amd64.deb
 dpkg -i libapparmor1_4.0.0~alpha2-0ubuntu5_amd64.deb
 dpkg -i apparmor_4.0.0~alpha2-0ubuntu5_amd64.deb
 rm -rf libapparmor1_4*.deb apparmor_4*.deb
 
-wget https://s3.amazonaws.com/artifacts.h2o.ai/deps/h2ogpt/ubuntu20.04/libarchive13_3.6.2-1ubuntu1_amd64.deb
+wget https://s3.amazonaws.com/artifacts.h2o.ai/deps/h2ogpt/libarchive13_3.6.2-1ubuntu1_amd64.deb
+wget https://s3.amazonaws.com/artifacts.h2o.ai/deps/h2ogpt/libarchive-dev_3.6.2-1ubuntu1_amd64.deb
 dpkg -i libarchive13_3.6.2-1ubuntu1_amd64.deb
-rm -rf libarchive13_3.6.2-1ubuntu1_amd64.deb
+dpkg -i libarchive-dev_3.6.2-1ubuntu1_amd64.deb
+rm -rf libarchive13_3.6.2-1ubuntu1_amd64.deb libarchive-dev_3.6.2-1ubuntu1_amd64.deb