diff --git a/dandelion/api/api_v1/endpoints/system_configs.py b/dandelion/api/api_v1/endpoints/system_configs.py
index 9f9c0da..33b10b6 100644
--- a/dandelion/api/api_v1/endpoints/system_configs.py
+++ b/dandelion/api/api_v1/endpoints/system_configs.py
@@ -23,7 +23,7 @@
 from dandelion import crud, models, schemas
 from dandelion.api import deps
 from dandelion.api.deps import OpenV2XHTTPException as HTTPException
-from dandelion.mqtt import cloud_server as mqtt_cloud_server, topic
+from dandelion.mqtt import cloud_server as mqtt_cloud_server, server, topic
 
 router = APIRouter()
 CONF: cfg = cfg.CONF
@@ -67,7 +67,7 @@ def create(
             raise HTTPException(
                 status_code=status.HTTP_400_BAD_REQUEST, detail="Cloud MQTT Connection failed"
             )
-    mqtt_cloud_server.MQTT_CLIENT.publish(topic=topic.V2X_EDGE_SITE_CHANGE)
+    server.MQTT_CLIENT.publish(topic=topic.V2X_EDGE_SITE_CHANGE)
 
     return system_config.to_dict()
 
diff --git a/dandelion/mqtt/service/rsu/rsu_algo.py b/dandelion/mqtt/service/rsu/rsu_algo.py
index 02de1a2..7323ea7 100644
--- a/dandelion/mqtt/service/rsu/rsu_algo.py
+++ b/dandelion/mqtt/service/rsu/rsu_algo.py
@@ -22,14 +22,14 @@
 from sqlalchemy.orm import Session
 
 from dandelion import crud
-from dandelion.mqtt import cloud_server as mqtt_cloud_server, topic
+from dandelion.mqtt import server, topic
 from dandelion.util import get_all_algo_config
 
 LOG: LoggerAdapter = log.getLogger(__name__)
 
 
 def algo_publish(db: Session):
-    if mqtt_cloud_server.MQTT_CLIENT is not None:
+    if server.MQTT_CLIENT is not None:
         redis_info: Dict = {}
         algo_in_db = crud.algo_name.get_multi_all(db=db)
         response_data = get_all_algo_config(data=algo_in_db)
@@ -37,7 +37,7 @@ def algo_publish(db: Session):
             algo_name = algo.get("algo")
             redis_info[algo_name] = algo.get("inUse") if algo.get("enable") else "disable"
         payload = json.dumps({"redis_info": redis_info})
-        mqtt_cloud_server.get_mqtt_client().publish(
+        server.get_mqtt_client().publish(
             topic=topic.V2X_RSU_PIP_CFG,
             payload=payload,
             qos=0,