diff --git a/.gitmodules b/.gitmodules
index 093a4a897..933a0e007 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "plugins/emqttd_dashboard"]
 	path = plugins/emqttd_dashboard
 	url = https://github.com/emqtt/emqttd_dashboard.git
+[submodule "plugins/emqttd_plugin_template"]
+	path = plugins/emqttd_plugin_template
+	url = https://github.com/emqtt/emqttd_plugin_template.git
diff --git a/plugins/emqttd_dashboard b/plugins/emqttd_dashboard
index fc49f53df..ca3182f5d 160000
--- a/plugins/emqttd_dashboard
+++ b/plugins/emqttd_dashboard
@@ -1 +1 @@
-Subproject commit fc49f53dfc3f02a09353e816f32980b113c42003
+Subproject commit ca3182f5ddf9b2776f826471b8ccc698218697f8
diff --git a/plugins/emqttd_plugin_demo/etc/plugin.config b/plugins/emqttd_plugin_demo/etc/plugin.config
deleted file mode 100644
index 57afcca04..000000000
--- a/plugins/emqttd_plugin_demo/etc/plugin.config
+++ /dev/null
@@ -1 +0,0 @@
-[].
diff --git a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo.app.src b/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo.app.src
deleted file mode 100644
index 1fd8ce62d..000000000
--- a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo.app.src
+++ /dev/null
@@ -1,12 +0,0 @@
-{application, emqttd_plugin_demo,
- [
-  {description, ""},
-  {vsn, "1"},
-  {registered, []},
-  {applications, [
-                  kernel,
-                  stdlib
-                 ]},
-  {mod, { emqttd_plugin_demo_app, []}},
-  {env, []}
- ]}.
diff --git a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_app.erl b/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_app.erl
deleted file mode 100644
index 9042a449a..000000000
--- a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_app.erl
+++ /dev/null
@@ -1,16 +0,0 @@
--module(emqttd_plugin_demo_app).
-
--behaviour(application).
-
-%% Application callbacks
--export([start/2, stop/1]).
-
-%% ===================================================================
-%% Application callbacks
-%% ===================================================================
-
-start(_StartType, _StartArgs) ->
-    emqttd_plugin_demo_sup:start_link().
-
-stop(_State) ->
-    ok.
diff --git a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_sup.erl b/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_sup.erl
deleted file mode 100644
index 65dad7a60..000000000
--- a/plugins/emqttd_plugin_demo/src/emqttd_plugin_demo_sup.erl
+++ /dev/null
@@ -1,27 +0,0 @@
--module(emqttd_plugin_demo_sup).
-
--behaviour(supervisor).
-
-%% API
--export([start_link/0]).
-
-%% Supervisor callbacks
--export([init/1]).
-
-%% Helper macro for declaring children of supervisor
--define(CHILD(I, Type), {I, {I, start_link, []}, permanent, 5000, Type, [I]}).
-
-%% ===================================================================
-%% API functions
-%% ===================================================================
-
-start_link() ->
-    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-
-%% ===================================================================
-%% Supervisor callbacks
-%% ===================================================================
-
-init([]) ->
-    {ok, { {one_for_one, 5, 10}, []} }.
-