diff --git a/apps/emqx_bridge_hstreamdb/rebar.config b/apps/emqx_bridge_hstreamdb/rebar.config
new file mode 100644
index 000000000..d9fafe205
--- /dev/null
+++ b/apps/emqx_bridge_hstreamdb/rebar.config
@@ -0,0 +1,11 @@
+%% -*- mode: erlang -*-
+{erl_opts, [debug_info]}.
+{deps, [
+  {hstreamdb_erl, {git, "https://github.com/hstreamdb/hstreamdb_erl.git", {tag, "0.2.5"}}},
+  {emqx, {path, "../../apps/emqx"}},
+  {emqx_utils, {path, "../../apps/emqx_utils"}}
+]}.
+
+{shell, [
+    {apps, [emqx_bridge_hstreamdb]}
+]}.
diff --git a/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.app.src b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.app.src
index 1cb3742b3..32fbc29ac 100644
--- a/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.app.src
+++ b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.app.src
@@ -1,6 +1,6 @@
 {application, emqx_bridge_hstreamdb, [
     {description, "EMQX Enterprise HStreamDB Bridge"},
-    {vsn, "0.1.0"},
+    {vsn, "0.1.1"},
     {registered, []},
     {applications, [kernel, stdlib]},
     {env, []},
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_hstreamdb.erl b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.erl
similarity index 95%
rename from lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_hstreamdb.erl
rename to apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.erl
index 13a70e7c7..dacfc3633 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_hstreamdb.erl
+++ b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
--module(emqx_ee_bridge_hstreamdb).
+-module(emqx_bridge_hstreamdb).
 
 -include_lib("typerefl/include/types.hrl").
 -include_lib("hocon/include/hoconsc.hrl").
@@ -66,7 +66,7 @@ fields("get") ->
 
 field(connector) ->
     mk(
-        hoconsc:union([binary(), ref(emqx_ee_connector_hstreamdb, config)]),
+        hoconsc:union([binary(), ref(emqx_bridge_hstreamdb_connector, config)]),
         #{
             required => true,
             example => <<"hstreamdb:demo">>,
diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_hstreamdb.erl b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector.erl
similarity index 99%
rename from lib-ee/emqx_ee_connector/src/emqx_ee_connector_hstreamdb.erl
rename to apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector.erl
index 70eca83d7..c2a210271 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_hstreamdb.erl
+++ b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
--module(emqx_ee_connector_hstreamdb).
+-module(emqx_bridge_hstreamdb_connector).
 
 -include_lib("hocon/include/hoconsc.hrl").
 -include_lib("typerefl/include/types.hrl").
diff --git a/lib-ee/emqx_ee_bridge/test/ee_bridge_hstreamdb_SUITE.erl b/apps/emqx_bridge_hstreamdb/test/emqx_bridge_hstreamdb_SUITE.erl
similarity index 91%
rename from lib-ee/emqx_ee_bridge/test/ee_bridge_hstreamdb_SUITE.erl
rename to apps/emqx_bridge_hstreamdb/test/emqx_bridge_hstreamdb_SUITE.erl
index 867b09f32..4b12beed7 100644
--- a/lib-ee/emqx_ee_bridge/test/ee_bridge_hstreamdb_SUITE.erl
+++ b/apps/emqx_bridge_hstreamdb/test/emqx_bridge_hstreamdb_SUITE.erl
@@ -2,7 +2,7 @@
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
 
--module(ee_bridge_hstreamdb_SUITE).
+-module(emqx_bridge_hstreamdb_SUITE).
 
 -compile(nowarn_export_all).
 -compile(export_all).
diff --git a/lib-ee/emqx_ee_connector/test/emqx_ee_connector_hstreamdb_SUITE.erl b/apps/emqx_bridge_hstreamdb/test/emqx_connector_hstreamdb_SUITE.erl
similarity index 90%
rename from lib-ee/emqx_ee_connector/test/emqx_ee_connector_hstreamdb_SUITE.erl
rename to apps/emqx_bridge_hstreamdb/test/emqx_connector_hstreamdb_SUITE.erl
index ad49d9f62..09ba487f7 100644
--- a/lib-ee/emqx_ee_connector/test/emqx_ee_connector_hstreamdb_SUITE.erl
+++ b/apps/emqx_bridge_hstreamdb/test/emqx_connector_hstreamdb_SUITE.erl
@@ -2,7 +2,7 @@
 %% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
 %%--------------------------------------------------------------------
 
--module(emqx_ee_connector_hstreamdb_SUITE).
+-module(emqx_connector_hstreamdb_SUITE).
 
 -compile(nowarn_export_all).
 -compile(export_all).
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
index 66f0dc3b4..17da77680 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
@@ -30,7 +30,7 @@ api_schemas(Method) ->
         api_ref(emqx_bridge_mongodb, <<"mongodb_rs">>, Method ++ "_rs"),
         api_ref(emqx_bridge_mongodb, <<"mongodb_sharded">>, Method ++ "_sharded"),
         api_ref(emqx_bridge_mongodb, <<"mongodb_single">>, Method ++ "_single"),
-        api_ref(emqx_ee_bridge_hstreamdb, <<"hstreamdb">>, Method),
+        api_ref(emqx_bridge_hstreamdb, <<"hstreamdb">>, Method),
         api_ref(emqx_bridge_influxdb, <<"influxdb_api_v1">>, Method ++ "_api_v1"),
         api_ref(emqx_bridge_influxdb, <<"influxdb_api_v2">>, Method ++ "_api_v2"),
         api_ref(emqx_bridge_redis, <<"redis_single">>, Method ++ "_single"),
@@ -54,7 +54,7 @@ schema_modules() ->
     [
         emqx_bridge_kafka,
         emqx_bridge_cassandra,
-        emqx_ee_bridge_hstreamdb,
+        emqx_bridge_hstreamdb,
         emqx_bridge_gcp_pubsub,
         emqx_bridge_influxdb,
         emqx_bridge_mongodb,
@@ -93,7 +93,7 @@ resource_type(kafka_consumer) -> emqx_bridge_kafka_impl_consumer;
 %% to hocon; keeping this as just `kafka' for backwards compatibility.
 resource_type(kafka) -> emqx_bridge_kafka_impl_producer;
 resource_type(cassandra) -> emqx_bridge_cassandra_connector;
-resource_type(hstreamdb) -> emqx_ee_connector_hstreamdb;
+resource_type(hstreamdb) -> emqx_bridge_hstreamdb_connector;
 resource_type(gcp_pubsub) -> emqx_bridge_gcp_pubsub_impl_producer;
 resource_type(gcp_pubsub_consumer) -> emqx_bridge_gcp_pubsub_impl_consumer;
 resource_type(mongodb_rs) -> emqx_bridge_mongodb_connector;
@@ -123,7 +123,7 @@ fields(bridges) ->
     [
         {hstreamdb,
             mk(
-                hoconsc:map(name, ref(emqx_ee_bridge_hstreamdb, "config")),
+                hoconsc:map(name, ref(emqx_bridge_hstreamdb, "config")),
                 #{
                     desc => <<"HStreamDB Bridge Config">>,
                     required => false
diff --git a/lib-ee/emqx_ee_connector/rebar.config b/lib-ee/emqx_ee_connector/rebar.config
index ee1d4e500..1f52a4f03 100644
--- a/lib-ee/emqx_ee_connector/rebar.config
+++ b/lib-ee/emqx_ee_connector/rebar.config
@@ -1,7 +1,6 @@
 %% -*- mode: erlang -*-
 {erl_opts, [debug_info]}.
 {deps, [
-  {hstreamdb_erl, {git, "https://github.com/hstreamdb/hstreamdb_erl.git", {tag, "0.2.5"}}},
   {emqx, {path, "../../apps/emqx"}},
   {emqx_utils, {path, "../../apps/emqx_utils"}}
 ]}.
diff --git a/rel/i18n/emqx_ee_bridge_hstreamdb.hocon b/rel/i18n/emqx_bridge_hstreamdb.hocon
similarity index 97%
rename from rel/i18n/emqx_ee_bridge_hstreamdb.hocon
rename to rel/i18n/emqx_bridge_hstreamdb.hocon
index cb43d483a..d9e7f1561 100644
--- a/rel/i18n/emqx_ee_bridge_hstreamdb.hocon
+++ b/rel/i18n/emqx_bridge_hstreamdb.hocon
@@ -1,4 +1,4 @@
-emqx_ee_bridge_hstreamdb {
+emqx_bridge_hstreamdb {
 
 config_direction.desc:
 """The direction of this bridge, MUST be 'egress'"""
diff --git a/rel/i18n/emqx_ee_connector_hstreamdb.hocon b/rel/i18n/emqx_bridge_hstreamdb_connector.hocon
similarity index 94%
rename from rel/i18n/emqx_ee_connector_hstreamdb.hocon
rename to rel/i18n/emqx_bridge_hstreamdb_connector.hocon
index f6838297f..001340e9c 100644
--- a/rel/i18n/emqx_ee_connector_hstreamdb.hocon
+++ b/rel/i18n/emqx_bridge_hstreamdb_connector.hocon
@@ -1,4 +1,4 @@
-emqx_ee_connector_hstreamdb {
+emqx_bridge_hstreamdb_connector {
 
 config.desc:
 """HStreamDB connection config"""