diff --git a/Dockerfile b/Dockerfile
index de43415aa89d1b21acaf81e9d622711f369c9e2b..52db811d37c6b6a5202dda1f27de3b204b5e3dad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,12 +15,19 @@ RUN apt-get update && \
 
 # Create a user
 RUN useradd -ms /bin/bash user
-USER user
 WORKDIR /home/user
+ENV HOME /home/user
+ENV USER user
 
-# Add useful aliases
+
+# Add external scripts
 ADD . /home/user
 RUN chmod +x add_useful_aliases.sh
+
+# Now act as `user`
+USER user
+
+# Add useful aliases
 RUN ./add_useful_aliases.sh
 
 # Install coverage tool