diff --git a/.gitignore b/.gitignore
index f3c389a21ec8..8327a3f240e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,6 @@ client_body_temp
 utils/lj-releng
 .idea/
 *.iml
-dashboard/
 \.*
 
 # .travis
diff --git a/.gitmodules b/.gitmodules
index 73b8155a96b0..31a8b7ee2e01 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "dashboard"]
 	path = dashboard
-	url = https://github.com/apache/incubator-apisix-dashboard-built.git
+	url = https://github.com/apache/incubator-apisix-dashboard.git
+
diff --git a/.travis/ASF-Release.cfg b/.travis/ASF-Release.cfg
index 703a3611f957..5021dab090c4 100644
--- a/.travis/ASF-Release.cfg
+++ b/.travis/ASF-Release.cfg
@@ -91,6 +91,9 @@ t/servroot
 conf
 .travis/openwhisk-utilities
 
+# Exclude dashboard files
+dashboard
+
 [Options]
 # Not all code files allow licenses to appear starting at the first character
 # of the file. This option tells the scan to allow licenses to appear starting
diff --git a/dashboard b/dashboard
new file mode 160000
index 000000000000..cfb3ee7b8721
--- /dev/null
+++ b/dashboard
@@ -0,0 +1 @@
+Subproject commit cfb3ee7b8721076975c1deaff3e52da3ea4a312a