diff --git a/Dockerfile b/Dockerfile
index 2fdcdb1..695f2ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -102,7 +102,7 @@ USER $USER
 WORKDIR $HOME
 
 # Keep existing user configuration files
-RUN zsh -c "cp -r /$BASE_USER/home/{.gitconfig,.motd,.tmux.conf,.zshenv,.zshrc} $HOME"
+RUN zsh -c "cp -r /$BASE_USER/home/{.gitconfig,.motd,.tmux.conf,.zlogin,.zshenv,.zshrc} $HOME"
 
 # Clone dotfiles configuration
 RUN alias https-to-git="sed 's;https://github.com/\(.*\);git@github.com:\1.git;'"
@@ -113,8 +113,6 @@ RUN vcsh clone https://github.com/sabrehagen/dotfiles-alacritty && \
 
 # Add program configurations
 COPY config/tmuxinator $HOME/.config/tmuxinator
-COPY config/zsh/.zshenv $HOME/.zshenv.desktop
-RUN sed -i '1s;^;source $HOME/.zshenv.desktop\n\n;' $HOME/.zshenv
 
 # Cache zsh plugins
 RUN zsh -c "source $HOME/.zshrc"
diff --git a/config/tmuxinator/desktop.yaml b/config/tmuxinator/desktop.yaml
deleted file mode 100644
index 097daa7..0000000
--- a/config/tmuxinator/desktop.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: dashboard
-pre_window: clear
-root: /jackson/home
-
-windows:
-  - terminal:
-      layout: main-vertical
-      panes:
-        - zsh
-        - zsh
diff --git a/scripts/kill-all.sh b/scripts/kill-all.sh
new file mode 100755
index 0000000..9d82ba2
--- /dev/null
+++ b/scripts/kill-all.sh
@@ -0,0 +1,5 @@
+# Remove all non desktop-environment containers
+docker ps -a | \
+  grep -v desktop-environment | \
+  cut -b 1-20 | \
+  xargs docker rm -f