diff --git a/Dockerfile b/Dockerfile
index ee8cfbf93..a482db726 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,14 @@
 FROM openjdk:8-jdk-alpine
-LABEL maintainer="Ryan Wang<i@ryanc.cc>"
 
-WORKDIR /opt/halo
-ADD . /tmp
-ENV TZ=Asia/Shanghai \
-DB_USER="admin" \
-DB_PASSWORD="123456"
+VOLUME /tmp
 
-RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && echo ${TZ} > /etc/timezone
+ARG JAR_FILE=build/libs/halo-1.0.0.bata.jar
+ARG PORT=8090
 
-RUN cd /tmp && ./gradlew bootjar && mv build/libs/* /opt/halo/ \
-    && rm -rf /tmp/* && rm -rf ~/.gradle
+ENV TZ=Asia/Shanghai
 
-EXPOSE 8090
+COPY ${JAR_FILE} halo.jar
 
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dlogging.level.run.halo.app=INFO", "-jar","/opt/halo/halo-1.0.0.jar","--spring.datasource.username=${DB_USER}","--spring.datasource.password=${DB_PASSWORD}"]
+EXPOSE ${PORT}
+
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","halo.jar"]
\ No newline at end of file
diff --git a/src/main/java/run/halo/app/Application.java b/src/main/java/run/halo/app/Application.java
index 2e52c6314..81f466e15 100755
--- a/src/main/java/run/halo/app/Application.java
+++ b/src/main/java/run/halo/app/Application.java
@@ -25,7 +25,7 @@ public class Application {
 
     public static void main(String[] args) {
         // Customize the spring config location
-        System.setProperty("spring.config.additional-location", "file:${user.home}/halo/,file:${user.home}/halo-dev/");
+        System.setProperty("spring.config.additional-location", "file:${user.home}/.halo/,file:${user.home}/halo-dev/");
 
         // Run application
         SpringApplication.run(Application.class, args);