diff --git a/Dockerfile b/Dockerfile
index b24fea224d..67094976c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 #
 # Build stage
 #
-FROM maven:3.6.3-jdk-8 AS build
+FROM maven:3.8.1-openjdk-16 AS build
 COPY src /home/app/src
 COPY pom.xml /home/app
 RUN mvn -f /home/app/pom.xml clean package
@@ -11,7 +11,7 @@ RUN mvn -f /home/app/pom.xml clean package
 #
 # Package stage
 #
-FROM openjdk:8
+FROM openjdk:16
 COPY --from=build /home/app/target/Cosmic.jar /usr/local/lib/Cosmic.jar
 COPY ./ ./
 EXPOSE 8484 7575 7576 7577