diff --git a/Dockerfile b/Dockerfile
index d8231d4..6838ffa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,13 @@
 FROM vshn/puppet-mcoclient
 
+USER root
+
 # Install puppetenvsh plugin
 RUN git clone https://github.com/optiz0r/mcollective-puppetenvsh-agent \
   && cp -r mcollective-puppetenvsh-agent/application/* /opt/puppetlabs/mcollective/plugins/mcollective/application/ \
   && cp -r mcollective-puppetenvsh-agent/agent/* /opt/puppetlabs/mcollective/plugins/mcollective/agent/ \
   && cp -r mcollective-puppetenvsh-agent/util/* /opt/puppetlabs/mcollective/plugins/mcollective/util/ \
   && rm -rf mcollective-puppetenvsh-agent
+
+USER $MCO_CLIENT_USER
+WORKDIR /home/$MCO_CLIENT_USER
\ No newline at end of file