diff --git a/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
new file mode 100644
index 0000000..aa5fccc
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.72
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
new file mode 100644
index 0000000..7c82755
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.54
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
new file mode 100644
index 0000000..18af809
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.72
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9
new file mode 100644
index 0000000..d9cfd0c
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.54
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]