diff --git a/Dockerfile b/Dockerfile
index 00b6ecd..a4e4ec4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,7 @@
 RUN apt-get update && apt-get install -y wget git curl zip && rm -rf /var/lib/apt/lists/*
 
 ENV JENKINS_VERSION 1.565.3
+ENV JENKINS_HOME /var/jenkins_home
 
 # `/usr/share/jenkins/ref/` contains all reference configuraiton we want to set on a fresh new installation
 # use it to bundle additional plugins or config file with your custom jenkins Docker image.
@@ -11,16 +12,15 @@
 # Jenkins is ran with user `jenkins`, uid = 1000
 # If you bind mount a volume from host/vloume from a data container, 
 # ensure you use same uid
-RUN useradd -d /home/jenkins -m -u 1000 -s /bin/bash jenkins
+RUN useradd -d "$JENKINS_HOME" -u 1000 -m -s /bin/bash jenkins
 
 COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-angent-port.groovy
 
 # could use ADD but this one does not check Last-Modified header - see https://github.com/docker/docker/issues/8331
 RUN curl -L http://mirrors.jenkins-ci.org/war-stable/$JENKINS_VERSION/jenkins.war -o /usr/share/jenkins/jenkins.war
 
-ENV JENKINS_HOME /var/jenkins_home
 ENV JENKINS_UC https://updates.jenkins-ci.org
-RUN usermod -m -d "$JENKINS_HOME" jenkins && chown -R jenkins "$JENKINS_HOME" /usr/share/jenkins/ref
+RUN chown -R jenkins "$JENKINS_HOME" /usr/share/jenkins/ref
 VOLUME /var/jenkins_home
 
 # for main web interface: