diff --git a/dockerfile/base.dockerfile b/dockerfile/base.dockerfile
index 666a8311c..d9d1235f2 100644
--- a/dockerfile/base.dockerfile
+++ b/dockerfile/base.dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:16.04
 
 ## environment variables
-ENV ENVIRONMENT docker
-ENV PUPPET /opt/puppetlabs/bin/puppet
-ENV ROOT_PROJECT /var/machine-learning
-ENV ROOT_PUPPET /etc/puppetlabs
-ENV MODULES $ROOT_PUPPET/code/modules
-ENV CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
-ENV ENVPATH $ROOT_PUPPET/code/environment/$ENVIRONMENT
-ENV PUPPET_VERSION puppet5-release-xenial.deb
+ENV ENVIRONMENT docker\
+    PUPPET /opt/puppetlabs/bin/puppet\
+    ROOT_PROJECT /var/machine-learning\
+    ROOT_PUPPET /etc/puppetlabs\
+    MODULES $ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib\
+    ENVPATH $ROOT_PUPPET/code/environment/$ENVIRONMENT\
+    PUPPET_VERSION puppet5-release-xenial.deb
 
 ## ensure directory
 RUN mkdir -p $ROOT_PROJECT/log $ROOT_PUPPET/code/environment/$ENVIRONMENT $ROOT_PUPPET/puppet/hiera $ROOT_PUPPET/code/modules_contrib
diff --git a/dockerfile/mongodb.dockerfile b/dockerfile/mongodb.dockerfile
index 64ab4c0c2..6aa074198 100644
--- a/dockerfile/mongodb.dockerfile
+++ b/dockerfile/mongodb.dockerfile
@@ -1,11 +1,11 @@
 FROM jeff1evesque/ml-base:0.8
 
 ## local variables
-ENV ENVIRONMENT docker
-ENV PUPPET /opt/puppetlabs/bin/puppet
-ENV ROOT_PUPPET /etc/puppetlabs
-ENV MODULES $ROOT_PUPPET/code/modules
-ENV CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+ENV ENVIRONMENT docker\
+    PUPPET /opt/puppetlabs/bin/puppet\
+    ROOT_PUPPET /etc/puppetlabs\
+    MODULES $ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
 
 ## copy files into container
 COPY hiera $ROOT_PUPPET/puppet/hiera
diff --git a/dockerfile/nginx.dockerfile b/dockerfile/nginx.dockerfile
index e32c14d64..4f5b21654 100644
--- a/dockerfile/nginx.dockerfile
+++ b/dockerfile/nginx.dockerfile
@@ -1,12 +1,13 @@
 FROM jeff1evesque/ml-base:0.8
 
 ## local variables
-ENV ENVIRONMENT docker
-ENV ROOT_PROJECT /var/machine-learning
-ENV PUPPET /opt/puppetlabs/bin/puppet
-ENV ROOT_PUPPET /etc/puppetlabs
-ENV MODULES $ROOT_PUPPET/code/modules
-ENV CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+ENV ENVIRONMENT docker\
+    ROOT_PROJECT /var/machine-learning\
+    PUPPET /opt/puppetlabs/bin/puppet\
+    ROOT_PUPPET /etc/puppetlabs\
+    MODULES $ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+
 ARG TYPE
 ARG VHOST
 ARG HOST_PORT
diff --git a/dockerfile/redis.dockerfile b/dockerfile/redis.dockerfile
index f9dd5d58d..fb69690de 100644
--- a/dockerfile/redis.dockerfile
+++ b/dockerfile/redis.dockerfile
@@ -1,11 +1,11 @@
 FROM jeff1evesque/ml-base:0.8
 
 ## local variables
-ENV ENVIRONMENT docker
-ENV PUPPET /opt/puppetlabs/bin/puppet
-ENV ROOT_PUPPET /etc/puppetlabs
-ENV MODULES $ROOT_PUPPET/code/modules
-ENV CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+ENV ENVIRONMENT docker\
+    PUPPET /opt/puppetlabs/bin/puppet\
+    ROOT_PUPPET /etc/puppetlabs\
+    MODULES $ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
 
 ## copy files into container
 COPY hiera $ROOT_PUPPET/puppet/hiera
diff --git a/dockerfile/sklearn.dockerfile b/dockerfile/sklearn.dockerfile
index 5945a082d..d343200ce 100644
--- a/dockerfile/sklearn.dockerfile
+++ b/dockerfile/sklearn.dockerfile
@@ -1,12 +1,12 @@
 FROM jeff1evesque/ml-base:0.8
 
 ## local variables
-ENV ENVIRONMENT docker
-ENV PUPPET /opt/puppetlabs/bin/puppet
-ENV ROOT_PROJECT /var/machine-learning
-ENV ROOT_PUPPET /etc/puppetlabs
-ENV MODULES $ROOT_PUPPET/code/modules
-ENV CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+ENV ENVIRONMENT docker\
+    PUPPET /opt/puppetlabs/bin/puppet\
+    ROOT_PROJECT /var/machine-learning\
+    ROOT_PUPPET /etc/puppetlabs\
+    MODULES $ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
 
 ## copy files into container
 COPY hiera $ROOT_PROJECT/hiera
diff --git a/dockerfile/webserver.dockerfile b/dockerfile/webserver.dockerfile
index ea1e6cef9..45be9d144 100644
--- a/dockerfile/webserver.dockerfile
+++ b/dockerfile/webserver.dockerfile
@@ -1,12 +1,12 @@
 FROM jeff1evesque/ml-sklearn:0.8
 
 ## local variables
-ENV ENVIRONMENT docker
-ENV PUPPET /opt/puppetlabs/bin/puppet
-ENV ROOT_PROJECT /var/machine-learning
-ENV ROOT_PUPPET /etc/puppetlabs
-ENV MODULES $ROOT_PUPPET/code/modules
-ENV CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+ENV ENVIRONMENT docker\
+    PUPPET /opt/puppetlabs/bin/puppet\
+    ROOT_PROJECT /var/machine-learning\
+    ROOT_PUPPET /etc/puppetlabs\
+    MODULES $ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
 
 ## ensure directory
 RUN mkdir -p $ROOT_PROJECT/interface $ROOT_PROJECT/hiera $ROOT_PUPPET/brain $ROOT_PUPPET/test