diff --git a/Dockerfile b/Dockerfile
index fa5ab6f274c908129b031b88a7dfe55367e44f58..be213074dc60c928cbf8421ce79ed644d3b7f0be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@
 # OutOfMemoryError. Increase -Xmx to -Xmx16g or -Xmx24g, if available.
 ####
 
-ARG FROM_IMAGE=usgs/amazoncorretto:8
+ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
 
 ####
 # Build nshmp-haz-ws
@@ -43,7 +43,10 @@ ENV TOMCAT_URL=${TOMCAT_SOURCE}/tomcat-8/v${TOMCAT_VERSION}/bin/apache-tomcat-${
 
 # Install Tomcat
 WORKDIR ${CATALINA_HOME}
-RUN curl -L ${TOMCAT_URL} | tar -xz --strip-components=1
+USER root
+RUN yum install -y tar \
+    && curl -L ${TOMCAT_URL} | tar -xz --strip-components=1
+USER usgs-user
 
 ENV WORKDIR=/app
 ENV WAR_PATH=${WORKDIR}/build/libs/nshmp-haz-ws.war