diff --git a/build/Dockerfile b/build/Dockerfile
index cd2d5077c9a..8ecc6c8b7a2 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -29,9 +29,9 @@
 
 # Declare the BASE_IMAGE argument in the first line, for more detail
 # see: https://github.com/moby/moby/issues/38379
-ARG BASE_IMAGE=openjdk:8-jdk
+ARG BASE_IMAGE=eclipse-temurin:8-jdk-focal
 
-FROM maven:3.6-jdk-8 as builder
+FROM eclipse-temurin:8-jdk-focal as builder
 
 ARG MVN_ARG
 
@@ -48,7 +48,8 @@ WORKDIR /workspace/kyuubi
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y python3 && \
+    apt-get install -y bash python3 && \
+    ln -snf /bin/bash /bin/sh && \
     ./build/dist ${MVN_ARG} && \
     mv /workspace/kyuubi/dist /opt/kyuubi && \
     # Removing stuff saves time because docker creates a temporary layer
@@ -71,7 +72,8 @@ COPY --from=builder /opt/kyuubi ${KYUUBI_HOME}
 RUN set -ex && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive \
-    apt install -y bash tini libc6 libpam-modules krb5-user libnss3 procps && \
+    apt-get install -y bash tini libc6 libpam-modules krb5-user libnss3 procps && \
+    ln -snf /bin/bash /bin/sh && \
     useradd -u ${kyuubi_uid} -g root kyuubi && \
     mkdir -p ${KYUUBI_HOME} ${KYUUBI_LOG_DIR} ${KYUUBI_PID_DIR} ${KYUUBI_WORK_DIR_ROOT} && \
     chmod ug+rw -R ${KYUUBI_HOME} && \
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 588f99b1fb5..19050082542 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -24,7 +24,7 @@
 #     -t the target repo and tag name
 #     more options can be found with -h
 
-ARG BASE_IMAGE=openjdk:8-jre-slim
+ARG BASE_IMAGE=eclipse-temurin:8-jdk-focal
 ARG spark_provided="spark_builtin"
 
 FROM ${BASE_IMAGE} as builder_spark_provided
@@ -34,7 +34,7 @@ ONBUILD ENV SPARK_HOME ${spark_home_in_docker}
 FROM ${BASE_IMAGE} as builder_spark_builtin
 
 ONBUILD ENV SPARK_HOME /opt/spark
-ONBUILD RUN mkdir -p  ${SPARK_HOME}
+ONBUILD RUN mkdir -p ${SPARK_HOME}
 ONBUILD COPY spark-binary ${SPARK_HOME}
 
 FROM builder_${spark_provided}
@@ -50,7 +50,8 @@ ENV KYUUBI_WORK_DIR_ROOT ${KYUUBI_HOME}/work
 RUN set -ex && \
     sed -i 's/http:\/\/deb.\(.*\)/https:\/\/deb.\1/g' /etc/apt/sources.list && \
     apt-get update && \
-    apt install -y bash tini libc6 libpam-modules krb5-user libnss3 procps && \
+    apt-get install -y bash tini libc6 libpam-modules krb5-user libnss3 procps && \
+    ln -snf /bin/bash /bin/sh && \
     useradd -u ${kyuubi_uid} -g root kyuubi -d /home/kyuubi -m && \
     mkdir -p ${KYUUBI_HOME} ${KYUUBI_LOG_DIR} ${KYUUBI_PID_DIR} ${KYUUBI_WORK_DIR_ROOT} && \
     rm -rf /var/cache/apt/*
diff --git a/tools/spark-block-cleaner/kubernetes/docker/Dockerfile b/tools/spark-block-cleaner/kubernetes/docker/Dockerfile
index d039dc355f9..95a7b2cf8aa 100644
--- a/tools/spark-block-cleaner/kubernetes/docker/Dockerfile
+++ b/tools/spark-block-cleaner/kubernetes/docker/Dockerfile
@@ -14,10 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM openjdk:8-jre-slim
+FROM eclipse-temurin:8-jdk-focal
 
 RUN apt-get update && \
     apt install -y tini && \
+    rm -rf /var/cache/apt/* && \
     mkdir /data && \
     mkdir -p /opt/block-cleaner && \
     mkdir -p /log/cleanerLog