diff --git a/wildfly/Dockerfile b/wildfly/Dockerfile
index 19c3106..99a6fb3 100755
--- a/wildfly/Dockerfile
+++ b/wildfly/Dockerfile
@@ -1,28 +1,28 @@
-FROM jboss/wildfly
+FROM jboss/wildfly:11.0.0.Final
 
 # Environment variable with default value
-ARG WAR_FILE_FROM=appfile.war
-ARG WAR_FILE_DEPLOY=${WAR_FILE_FROM}
+# ARG WAR_FILE_FROM=appfile.war
+# ARG WAR_FILE_DEPLOY=${WAR_FILE_FROM}
+LABEL maintainer="richard_shih@wanhai.com"
 
-#RUN echo ${APP_FILE}
-
-USER root
-# RUN yum install net-tools -y
+#default user is 'jboss'
+#USER jboss
 
 #prepare tmp dir
-COPY ./modules/* /tmp/modules/
+COPY --chown=jboss . ${JBOSS_HOME}/config
 
-#create additional modules
-RUN /tmp/modules/make_modules.sh
+#customize modules
+RUN cd ${JBOSS_HOME}/config/modules && ./make_modules.sh
 
-# Add your application to the deployment folder
-COPY ${WAR_FILE_FROM} ${JBOSS_HOME}/standalone/deployments/${WAR_FILE_DEPLOY}
-COPY startwf-ha.sh ${JBOSS_HOME}/bin/startwf-ha.sh
+#customize settings
+RUN cd ${JBOSS_HOME}/config/initial && ./setup.sh
 
-# Add user for adminstration purpose
-RUN ${JBOSS_HOME}/bin/add-user.sh admin wanhai_2 --silent
-USER jboss
+#cleanup
+RUN rm -rf ${JBOSS_HOME}/config
+
+# Add your application to the deployment folder
+# COPY ${WAR_FILE_FROM} ${JBOSS_HOME}/standalone/deployments/${WAR_FILE_DEPLOY}
 
 EXPOSE 8080 9990
 
-CMD ["sh","-c","/opt/jboss/wildfly/bin/startwf-ha.sh"]
\ No newline at end of file
+CMD ["sh","-c","/opt/jboss/wildfly/bin/startwf.sh"]
\ No newline at end of file
diff --git a/wildfly/initial/setup.sh b/wildfly/initial/setup.sh
new file mode 100755
index 0000000..53359fc
--- /dev/null
+++ b/wildfly/initial/setup.sh
@@ -0,0 +1,4 @@
+# Add user for adminstration purpose
+${JBOSS_HOME}/bin/add-user.sh admin wanhai_2 --silent
+
+cp ./startwf.sh ${JBOSS_HOME}/bin/startwf.sh
\ No newline at end of file
diff --git a/wildfly/startwf-ha.sh b/wildfly/initial/startwf.sh
similarity index 100%
rename from wildfly/startwf-ha.sh
rename to wildfly/initial/startwf.sh
diff --git a/wildfly/modules/make_modules.sh b/wildfly/modules/make_modules.sh
index dbcd3e3..03dfe12 100755
--- a/wildfly/modules/make_modules.sh
+++ b/wildfly/modules/make_modules.sh
@@ -7,7 +7,7 @@ ZK7_VER='7.0.3'
 echo 'Download jars of org.apache.commons.fileupload =>'
 mkdir -p ${WF_MODULE_PATH}/org/apache/commons/fileupload/main
 curl -# -o ${WF_MODULE_PATH}/org/apache/commons/fileupload/main/commons-fileupload.jar http://central.maven.org/maven2/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar
-cp /tmp/modules/module_commons_fileupload.xml ${WF_MODULE_PATH}/org/apache/commons/fileupload/main/module.xml
+cp ./module_commons_fileupload.xml ${WF_MODULE_PATH}/org/apache/commons/fileupload/main/module.xml
 
 #setup zk module(7.0.3)
 echo 'Download jars of zk-'${ZK7_VER} '=>'
@@ -26,7 +26,7 @@ curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER}/zsoup.jar http://mavensync.
 curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER}/bsh.jar http://central.maven.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar 
 curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER}/slf4j-api.jar http://central.maven.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar 
 curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER}/slf4j-jdk14.jar http://central.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.5/slf4j-jdk14-1.7.5.jar 
-cp /tmp/modules/module_zk7.xml ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER}/module.xml
+cp ./module_zk7.xml ${WF_MODULE_PATH}/org/zkoss/zk/${ZK7_VER}/module.xml
 
 #setup zk module(8.0.2.2)
 echo 'Download jars of zk-'${ZK8_VER} '=>'
@@ -45,11 +45,11 @@ curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK8_VER}/zsoup.jar http://mavensync.
 curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK8_VER}/bsh.jar http://central.maven.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar 
 curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK8_VER}/slf4j-api.jar http://central.maven.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar 
 curl -# -o ${WF_MODULE_PATH}/org/zkoss/zk/${ZK8_VER}/slf4j-jdk14.jar http://central.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.5/slf4j-jdk14-1.7.5.jar 
-cp /tmp/modules/module_zk8.xml ${WF_MODULE_PATH}/org/zkoss/zk/${ZK8_VER}/module.xml
+cp ./module_zk8.xml ${WF_MODULE_PATH}/org/zkoss/zk/${ZK8_VER}/module.xml
 
-mkdir ${WF_MODULE_PATH}/org/zkoss/zk/main && cp /tmp/modules/module_zk.xml ${WF_MODULE_PATH}/org/zkoss/zk/main/module.xml
+#setup default slot of zk module(default is zk8)
+mkdir ${WF_MODULE_PATH}/org/zkoss/zk/main && cp ./module_zk.xml ${WF_MODULE_PATH}/org/zkoss/zk/main/module.xml
 
-rm -rf /tmp
 
 
 
diff --git a/wildfly/modules/module_commons_fileupload.xml b/wildfly/modules/module_commons_fileupload.xml
old mode 100644
new mode 100755