diff --git a/java11/Dockerfile b/java11/Dockerfile
index 6b4ae7c..e9969bc 100644
--- a/java11/Dockerfile
+++ b/java11/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:11-jre-alpine
 
 ARG EXPOSE_PORT=8080
 EXPOSE ${EXPOSE_PORT}
@@ -19,9 +19,8 @@ LABEL io.k8s.description="Platform for running plain Java applications (fat-jar
       com.yunify.dev-mode.port="JAVA_DEBUG_PORT:5005"
 
 #Install package
-RUN apt update && apt -y install \
-      fontconfig \
-      && rm -rf /var/lib/apt/list/*
+RUN apk upgrade && apk add --update --no-cache ttf-dejavu fontconfig \
+    && fc-cache --force
 
 # S2I scripts + README
 COPY s2i /usr/local/s2i
diff --git a/java8/Dockerfile b/java8/Dockerfile
index 0f0ea51..36f57e0 100644
--- a/java8/Dockerfile
+++ b/java8/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-alpine
+FROM eclipse-temurin:8-jdk-alpine
 
 ARG EXPOSE_PORT=8080
 EXPOSE ${EXPOSE_PORT}
diff --git a/tomcat85-java11/Dockerfile b/tomcat85-java11/Dockerfile
index e441e32..aaafbdc 100644
--- a/tomcat85-java11/Dockerfile
+++ b/tomcat85-java11/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:11-jre-alpine
 
 
 MAINTAINER kubesphere@yunify.com
@@ -20,14 +20,13 @@ LABEL io.kubesphere.s2i.version.maven="3.5.4" \
 
 EXPOSE 8080
 
-ENV TOMCAT_VERSION 8.5.32
+ENV TOMCAT_VERSION 8.5.92
 
 USER root
 
 #Install package
-RUN apt update && apt -y install \
-      fontconfig \
-      && rm -rf /var/lib/apt/list/*
+RUN apk upgrade && apk add --update --no-cache ttf-dejavu fontconfig \
+    && fc-cache --force
 
 # Get and Unpack Tomcat
 RUN apt-get update \
diff --git a/tomcat85-java8/Dockerfile b/tomcat85-java8/Dockerfile
index e2d8ab3..f2c1067 100644
--- a/tomcat85-java8/Dockerfile
+++ b/tomcat85-java8/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-alpine
+FROM eclipse-temurin:8-jdk-alpine
 
 
 MAINTAINER kubesphere@yunify.com
@@ -20,7 +20,7 @@ LABEL io.kubesphere.s2i.version.maven="3.5.4" \
 
 EXPOSE 8080
 
-ENV TOMCAT_VERSION 8.5.32
+ENV TOMCAT_VERSION 8.5.92
 
 USER root