diff --git a/Dockerfile b/Dockerfile
index 2b547f6..58b9dfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM alpine:latest
+#FROM alpine:latest
+FROM tomcat:jdk15-openjdk-slim-buster
 
 ARG APPLICATION="guacamole"
 ARG BUILD_RFC3339="2021-01-20T22:59:00Z"
@@ -28,7 +29,6 @@ ENV \
       PACKAGE="${PACKAGE}" \
       VERSION="${VERSION}"
 
-FROM tomcat:jdk15-openjdk-slim-buster
 
 ENV ARCH=amd64 \
 GUAC_VER=1.3.0 \
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 9c5fdd2..ca8b128 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -1,5 +1,5 @@
-FROM arm64v8/alpine:latest
-
+#FROM arm64v8/alpine:latest
+FROM arm64v8/tomcat:jdk15-openjdk-slim-buster
 # Copy downloaded architecture emulation static binary
 COPY qemu-aarch64-static /usr/bin/
 
@@ -31,8 +31,6 @@ ENV \
       PACKAGE="${PACKAGE}" \
       VERSION="${VERSION}"
 
-FROM arm64v8/tomcat:jdk15-openjdk-slim-buster
-
 ENV ARCH=aarch64 \
 GUAC_VER=1.3.0 \
 GUACAMOLE_HOME=/app/guacamole \