diff --git a/.k8s_ci.Dockerfile b/.k8s_ci.Dockerfile
index 9a3a4addc64..f8419531551 100644
--- a/.k8s_ci.Dockerfile
+++ b/.k8s_ci.Dockerfile
@@ -18,11 +18,8 @@
 ARG ROOT_DIR=/galaxy
 ARG SERVER_DIR=$ROOT_DIR/server
 
-# For much faster build time override this with image0 (Dockerfile.0 build):
-#   docker build --build-arg BASE=<image0 name>...
 ARG STAGE1_BASE=python:3.7-slim
 ARG FINAL_STAGE_BASE=$STAGE1_BASE
-# NOTE: the value of GALAXY_USER must be also hardcoded in COPY in final stage
 ARG GALAXY_USER=galaxy
 ARG GALAXY_PLAYBOOK_REPO=https://github.com/galaxyproject/galaxy-docker-k8s
 
@@ -137,9 +134,10 @@ RUN set -xe; \
         procps \
         less \
         bzip2 \
+        tini \
     && update-alternatives --install /usr/bin/nano nano /bin/nano-tiny 0 \
     && update-alternatives --install /usr/bin/vim vim /usr/bin/vim.tiny 0 \
-    && echo "set nocompatible" >> /usr/share/vim/vimrc.tiny \
+    && echo "set nocompatible\nset backspace=indent,eol,start" >> /usr/share/vim/vimrc.tiny \
     && echo "$LANG UTF-8" > /etc/locale.gen \
     && locale-gen $LANG && update-locale LANG=$LANG \
     && apt-get autoremove -y && apt-get clean \
@@ -153,9 +151,9 @@ RUN set -xe; \
 
 WORKDIR $ROOT_DIR
 # Copy galaxy files to final image
-# The chown value MUST be hardcoded (see #35018 at github.com/moby/moby)
-COPY --chown=galaxy:galaxy --from=server_build $ROOT_DIR .
-COPY --chown=galaxy:galaxy --from=client_build $SERVER_DIR/static ./server/static
+# The chown value MUST be hardcoded (see https://github.com/moby/moby/issues/35018)
+COPY --chown=$GALAXY_USER:$GALAXY_USER --from=server_build $ROOT_DIR .
+COPY --chown=$GALAXY_USER:$GALAXY_USER --from=client_build $SERVER_DIR/static ./server/static
 
 WORKDIR $SERVER_DIR
 EXPOSE 8080
@@ -164,5 +162,7 @@ USER $GALAXY_USER
 ENV PATH="$SERVER_DIR/.venv/bin:${PATH}"
 ENV GALAXY_CONFIG_CONDA_AUTO_INIT=False
 
+ENTRYPOINT ["tini", "--"]
+
 # [optional] to run:
 CMD uwsgi --yaml config/galaxy.yml