diff --git a/docker/Dockerfile b/docker/Dockerfile
index 65577e2..7954380 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,20 +4,21 @@ ARG DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD
 ARG DESKTOP_ENVIRONMENT_REGISTRY
 ARG DESKTOP_ENVIRONMENT_USER
 
-ENV USER $DESKTOP_ENVIRONMENT_REGISTRY
-ENV USER $DESKTOP_ENVIRONMENT_USER
 ENV DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD ${DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD:-'$6$7De0aW9hUvGDKZmc$qrylcFmwKAL9iGNG9dvQ/GXCM4gLY.hES/P2d/3ZzRxkVMjD77WeTVSxV1P9XtmE9iAUmDwDTCHiVK.p5Ct1y1:18193:0:99999:7:::'}
+ENV DESKTOP_ENVIRONMENT_REGISTRY $DESKTOP_ENVIRONMENT_REGISTRY
 ENV DISPLAY :1
 ENV EDITOR nano
-ENV HOME /home/$USER
 ENV LANG en_US.UTF-8
 ENV LANGUAGE $LANG
 ENV LC_ALL $LANG
 ENV LC_CTYPE $LANG
 ENV SHELL /bin/zsh
 ENV TERM xterm-256color
+ENV USER $DESKTOP_ENVIRONMENT_USER
 ENV TZ Australia/Sydney
 
+ENV HOME /home/$USER
+
 # Restore minimized distribution content e.g. man pages
 RUN yes | unminimize
 
@@ -435,8 +436,6 @@ WORKDIR $HOME
 ARG DOTFILES_CACHEBUST
 RUN DOTFILES_CACHEBUST=$DOTFILES_CACHEBUST echo "Building from dotfiles..."
 
-RUN curl ip-api.com
-
 # Clone user dotfiles
 RUN vcsh clone https://$DESKTOP_ENVIRONMENT_REGISTRY@github.com/$DESKTOP_ENVIRONMENT_REGISTRY/dotfiles.git && \
   $HOME/.dotfiles-bootstrap.sh