diff --git a/jenkins-docker/server/Dockerfile b/jenkins-docker/server/Dockerfile
index 17998f7..0d5c329 100644
--- a/jenkins-docker/server/Dockerfile
+++ b/jenkins-docker/server/Dockerfile
@@ -1,8 +1,10 @@
+ARG JENKINS_WAR_VER
 FROM jenkins/jenkins:${JENKINS_WAR_VER}
 
 USER root
 
-RUN echo "$JENKINS_WAR_SHA  /usr/share/jenkins/jenkins.war" | sha1sum -c -
+ARG JENKINS_WAR_SHA
+RUN echo "$JENKINS_WAR_SHA /usr/share/jenkins/jenkins.war" | sha1sum -c -
 
 # Override Jenkins start-up script
 RUN mv /usr/local/bin/jenkins.sh /usr/local/bin/run-jenkins.sh
diff --git a/jenkins-docker/server/Makefile b/jenkins-docker/server/Makefile
index 14f0359..c2866eb 100644
--- a/jenkins-docker/server/Makefile
+++ b/jenkins-docker/server/Makefile
@@ -49,9 +49,10 @@
           -p 8080:8080 ${IMAGE}
 
 build:
-	 cat Dockerfile | JENKINS_WAR_VER=${JENKINS_WAR_VER} JENKINS_WAR_SHA=${JENKINS_WAR_SHA} envsubst \$$JENKINS_WAR_VER,\$$JENKINS_WAR_SHA > Dockerfile-subst
 	docker build --no-cache=$(NO_CACHE) \
-        -t ${IMAGE} -f Dockerfile-subst .
+          --build-arg JENKINS_WAR_VER=${JENKINS_WAR_VER} \
+          --build-arg JENKINS_WAR_SHA=${JENKINS_WAR_SHA} \
+          -t ${IMAGE} .
 
 publish:
 	docker push ${IMAGE}