diff --git a/docker-images/ziti-cli/Dockerfile b/docker-images/ziti-cli/Dockerfile
index d33bb7ca5..125fb3628 100644
--- a/docker-images/ziti-cli/Dockerfile
+++ b/docker-images/ziti-cli/Dockerfile
@@ -28,7 +28,7 @@ LABEL name="openziti/ziti-cli" \
 USER root
 
 ### install packages
-RUN   INSTALL_PKGS="python38 python38-pip tar bash-completion" && \
+RUN   INSTALL_PKGS="python38 python38-pip tar bash-completion vim-minimal less" && \
       microdnf -y update --setopt=install_weak_deps=0 --setopt=tsflags=nodocs && \
       microdnf -y install --setopt=install_weak_deps=0 --setopt=tsflags=nodocs ${INSTALL_PKGS}
 
diff --git a/docker-images/ziti-controller/Dockerfile b/docker-images/ziti-controller/Dockerfile
index 791490a0a..71fe158fd 100644
--- a/docker-images/ziti-controller/Dockerfile
+++ b/docker-images/ziti-controller/Dockerfile
@@ -16,6 +16,6 @@ LABEL name="openziti/ziti-controller" \
 USER root
 COPY ./entrypoint.sh /
 RUN chmod +x /entrypoint.sh
-USER nobody
+USER ziggy
 ENTRYPOINT [ "/entrypoint.sh" ]
 CMD [ "run" ]
diff --git a/docker-images/ziti-router/Dockerfile b/docker-images/ziti-router/Dockerfile
index 5b7ccfd7d..eb6b1c682 100644
--- a/docker-images/ziti-router/Dockerfile
+++ b/docker-images/ziti-router/Dockerfile
@@ -16,6 +16,6 @@ LABEL name="openziti/ziti-router" \
 USER root
 COPY ./entrypoint.sh /
 RUN chmod +x /entrypoint.sh
-USER nobody
+USER ziggy
 ENTRYPOINT [ "/entrypoint.sh" ]
 CMD [ "run" ]