diff --git a/docker/Dockerfile b/docker/Dockerfile
index 74681c2cd..5d8ca2827 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -51,10 +51,8 @@ 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 && \
-    useradd -u ${kyuubi_uid} -g root kyuubi && \
+    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} && \
-    chmod ug+rw -R ${KYUUBI_HOME} && \
-    chmod a+rwx -R ${KYUUBI_WORK_DIR_ROOT} && \
     rm -rf /var/cache/apt/*
 
 COPY bin ${KYUUBI_HOME}/bin
@@ -63,6 +61,9 @@ COPY beeline-jars ${KYUUBI_HOME}/beeline-jars
 COPY externals/engines/spark ${KYUUBI_HOME}/externals/engines/spark
 
 WORKDIR ${KYUUBI_HOME}
+RUN chown -R kyuubi:root ${KYUUBI_HOME} && \
+    chmod ug+rw -R ${KYUUBI_HOME} && \
+    chmod a+rwx -R ${KYUUBI_WORK_DIR_ROOT}
 
 CMD [ "./bin/kyuubi", "run" ]