diff --git a/Dockerfile b/Dockerfile
index e7e726a..7bd2002 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,9 @@ RUN ln -snf /usr/share/zoneinfo/US/Pacific /etc/localtime && \
   echo "set editing-mode vi" | tee -a /etc/inputrc && \
   echo "set keymap vi" | tee -a /etc/inputrc && \
   useradd -u 5000 -m ubuntu && \
-  echo "ubuntu  ALL=(ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/ubuntu-root
+  echo "ubuntu  ALL=(ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/ubuntu-root && \
+  echo "set -o vi" | tee /home/ubuntu/.zshrc &&
+  chown -R ubuntu:ubuntu /home/ubuntu
 
 COPY tools/check-clock-skew.sh /usr/local/bin/check-clock-skew.sh
 COPY --from=http-server /app/go-httpserver /usr/local/bin/go-httpserver