diff --git a/containers/Containerfile-base b/containers/Containerfile-base
index 2684b0d..a53711d 100644
--- a/containers/Containerfile-base
+++ b/containers/Containerfile-base
@@ -14,40 +14,42 @@ RUN apt-get update \
 
 RUN apt-get update \
     && apt-get install -y \
-        git \
         sudo \
+        wget \
         openssh-client \
         openssh-server \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN apt-get update \
+    && apt-get install -y \
+        git \
+        vim \
         curl \
         stow \
         zsh \
-        screen \
         tmux \
+        screen \
         powerline \
         zssh \
-        wget \
     && rm -rf /var/lib/apt/lists/*
 
 RUN git clone https://github.com/gbraad/dotfiles ~/.dotfiles \
     && ~/.dotfiles/install.sh
 
-RUN curl -fsSL https://pkgs.tailscale.com/stable/debian/bookworm.noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null \
+RUN curl -fsSL https://pkgs.tailscale.com/stable/debian/bookworm.noarmor.gpg -o /usr/share/keyrings/tailscale-archive-keyring.gpg \
     && curl -fsSL https://pkgs.tailscale.com/stable/debian/bookworm.tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list \
-    && sudo apt-get update \
-    && sudo apt-get install -y \
+    && apt-get update \
+    && apt-get install -y \
         tailscale \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /var/run/tailscale /var/cache/tailscale /var/lib/tailscale
 
 COPY assets/tailscaled /etc/init.d/tailscaled
 
-RUN sudo mkdir -p -m 755 /etc/apt/keyrings \
-    && out=$(mktemp) && wget -nv -O$out https://cli.github.com/packages/githubcli-archive-keyring.gpg \
-    && cat $out | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
-    && sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg -o /etc/apt/keyrings/githubcli-archive-keyring.gpg \
     && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
-    && sudo apt update \
-    && sudo apt install -y \
+    && apt update \
+    && apt install -y \
         gh \
     && rm -rf /var/lib/apt/lists/*