diff --git a/default.env b/default.env
index 40a97f0..a145822 100644
--- a/default.env
+++ b/default.env
@@ -1,4 +1,4 @@
-XNAT_VERSION=1.8.10
+XNAT_VERSION=1.8.10.5
 XNAT_MIN_HEAP=256m
 XNAT_MAX_HEAP=4g
 XNAT_SMTP_ENABLED=false
diff --git a/xnat/Dockerfile b/xnat/Dockerfile
index 747d46c..975b3bb 100644
--- a/xnat/Dockerfile
+++ b/xnat/Dockerfile
@@ -1,4 +1,4 @@
-FROM tomcat:9-jdk8-openjdk-buster
+FROM tomcat:9-jdk8-openjdk-bullseye
 MAINTAINER Matt Kelsey <kelseym@wustl.edu>
 
 ARG XNAT_VERSION=${XNAT_VERSION}
@@ -23,7 +23,7 @@ ARG TOMCAT_XNAT_FOLDER_PATH=${CATALINA_HOME}/webapps/${TOMCAT_XNAT_FOLDER}
 ADD make-xnat-config.sh /usr/local/bin/make-xnat-config.sh
 ADD wait-for-postgres.sh /usr/local/bin/wait-for-postgres.sh
 
-RUN apt-get update && apt-get install -y postgresql-client wget 
+RUN apt-get update && apt-get install -y postgresql-client wget
 RUN rm -rf ${CATALINA_HOME}/webapps/*
 RUN mkdir -p \
         ${TOMCAT_XNAT_FOLDER_PATH} \