diff --git a/Dockerfile.api b/Dockerfile.api
index f5d4664..df4c7c4 100644
--- a/Dockerfile.api
+++ b/Dockerfile.api
@@ -1,5 +1,13 @@
 FROM necbaas/tomcat
 
+# Install BaaS Server
+ENV BAAS_VERSION 7.5.0
+RUN cd /opt \
+    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
+    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
+    && cp baas-server-$BAAS_VERSION/server/api.war /opt/tomcat/webapps/ \
+    && /bin/rm -rf baas-server-$BAAS_VERSION*
+
 # Add config files
 RUN mkdir /etc/baas /var/log/baas
 ADD properties.template.xml /etc/baas/
@@ -19,12 +27,4 @@ VOLUME ["/opt/tomcat/logs","/var/log/baas"]
 # Open Tomcat port
 EXPOSE 8080
 
-# Install BaaS Server
-ENV BAAS_VERSION 7.5.0
-RUN cd /opt \
-    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
-    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
-    && cp baas-server-$BAAS_VERSION/server/api.war /opt/tomcat/webapps/ \
-    && /bin/rm -rf baas-server-$BAAS_VERSION*
- 
 CMD ["/bootstrap.sh"]
diff --git a/Dockerfile.both b/Dockerfile.both
index 28f9f16..ebf8f38 100644
--- a/Dockerfile.both
+++ b/Dockerfile.both
@@ -1,5 +1,13 @@
 FROM necbaas/tomcat
 
+# Install BaaS Server
+ENV BAAS_VERSION 7.5.0
+RUN cd /opt \
+    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
+    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
+    && cp baas-server-$BAAS_VERSION/server/*.war /opt/tomcat/webapps/ \
+    && /bin/rm -rf baas-server-$BAAS_VERSION*
+
 # Add config files
 RUN mkdir /etc/baas /var/log/baas
 ADD properties.template.xml /etc/baas/
@@ -19,12 +27,4 @@ VOLUME ["/opt/tomcat/logs","/var/log/baas"]
 # Open Tomcat port
 EXPOSE 8080
 
-# Install BaaS Server
-ENV BAAS_VERSION 7.5.0
-RUN cd /opt \
-    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
-    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
-    && cp baas-server-$BAAS_VERSION/server/*.war /opt/tomcat/webapps/ \
-    && /bin/rm -rf baas-server-$BAAS_VERSION*
- 
 CMD ["/bootstrap.sh"]
diff --git a/Dockerfile.console b/Dockerfile.console
index d555559..042b007 100644
--- a/Dockerfile.console
+++ b/Dockerfile.console
@@ -1,5 +1,13 @@
 FROM necbaas/tomcat
 
+# Install BaaS Server
+ENV BAAS_VERSION 7.5.0
+RUN cd /opt \
+    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
+    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
+    && cp baas-server-$BAAS_VERSION/server/console.war /opt/tomcat/webapps/ \
+    && /bin/rm -rf baas-server-$BAAS_VERSION*
+
 # Add config files
 RUN mkdir /etc/baas /var/log/baas
 ADD properties.template.xml /etc/baas/
@@ -19,12 +27,4 @@ VOLUME ["/opt/tomcat/logs","/var/log/baas"]
 # Open Tomcat port
 EXPOSE 8080
 
-# Install BaaS Server
-ENV BAAS_VERSION 7.5.0
-RUN cd /opt \
-    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
-    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
-    && cp baas-server-$BAAS_VERSION/server/console.war /opt/tomcat/webapps/ \
-    && /bin/rm -rf baas-server-$BAAS_VERSION*
- 
 CMD ["/bootstrap.sh"]
diff --git a/Dockerfile.in b/Dockerfile.in
index fee0573..27d7fa7 100644
--- a/Dockerfile.in
+++ b/Dockerfile.in
@@ -1,5 +1,13 @@
 FROM necbaas/tomcat
 
+# Install BaaS Server
+ENV BAAS_VERSION 7.5.0
+RUN cd /opt \
+    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
+    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
+    && cp baas-server-$BAAS_VERSION/server/%%SERVER_TYPE%%.war /opt/tomcat/webapps/ \
+    && /bin/rm -rf baas-server-$BAAS_VERSION*
+
 # Add config files
 RUN mkdir /etc/baas /var/log/baas
 ADD properties.template.xml /etc/baas/
@@ -19,12 +27,4 @@ VOLUME ["/opt/tomcat/logs","/var/log/baas"]
 # Open Tomcat port
 EXPOSE 8080
 
-# Install BaaS Server
-ENV BAAS_VERSION 7.5.0
-RUN cd /opt \
-    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
-    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
-    && cp baas-server-$BAAS_VERSION/server/%%SERVER_TYPE%%.war /opt/tomcat/webapps/ \
-    && /bin/rm -rf baas-server-$BAAS_VERSION*
- 
 CMD ["/bootstrap.sh"]