diff --git a/Dockerfile b/Dockerfile
index 03612a7..e9c7cfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,8 +68,7 @@ ENV USER jackson
 ENV HOME /$USER/home
 
 # Make the user's workspace directory
-RUN mkdir -p $HOME && \
-  chown -R $USER:$USER /$USER
+RUN mkdir -p $HOME
 
 # Program environment configuration
 ENV SSH_AUTH_SOCK $HOME/.ssh.sock
@@ -96,6 +95,9 @@ RUN usermod \
   --groups audio,chrome,video \
   $USER
 
+# Take ownership of the desktop user's folder
+RUN chown -R $USER:$USER /$USER
+
 # Become the desktop user
 USER $USER
 WORKDIR $HOME