diff --git a/Dockerfile b/Dockerfile
index 5387f7b..db3a173 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,9 +12,6 @@ ENV STEMN_TMUX_SESSION desktop-environment
 # Make the user's workspace directory
 RUN mkdir -p $HOME
 
-# Keep existing user configuration files
-RUN zsh -c "cp -r /$BASE_USER/home/{.gitconfig,.tmux.conf,.zshenv,.zshrc} $HOME"
-
 # Rename the first non-root group to jackson
 RUN groupmod \
   --new-name \
@@ -91,6 +88,9 @@ ENV CONTAINER_IMAGE_NAME sabrehagen/desktop-environment
 USER $USER
 WORKDIR $HOME
 
+# Keep existing user configuration files
+RUN zsh -c "cp -r /$BASE_USER/home/{.gitconfig,.motd,.tmux.conf,.zshenv,.zshrc} $HOME"
+
 # Clone dotfiles configuration
 RUN alias https-to-git="sed 's;https://github.com/\(.*\);git@github.com:\1.git;'"
 RUN vcsh clone https://github.com/sabrehagen/dotfiles-alacritty && \
diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv
index 2e83fb2..7d514cb 100644
--- a/config/zsh/.zshenv
+++ b/config/zsh/.zshenv
@@ -1,5 +1,5 @@
 # Configure tmux to always use utf8 mode and a fixed socket path
-export CONTAINER_TMUX_SOCKET=$HOME/.tmux/tmux.sock
+export CONTAINER_TMUX_SOCKET=$HOME/.tmux.sock
 touch $CONTAINER_TMUX_SOCKET
 alias tmux="tmux -u -S $CONTAINER_TMUX_SOCKET"