diff --git a/dockers/docker-orchagent/orch_zmq_tables.conf.j2 b/dockers/docker-orchagent/orch_zmq_tables.conf.j2
index b3cb9f99644..65d77b91d44 100644
--- a/dockers/docker-orchagent/orch_zmq_tables.conf.j2
+++ b/dockers/docker-orchagent/orch_zmq_tables.conf.j2
@@ -1,4 +1,4 @@
-{% if DEVICE_METADATA.localhost.orch_dash_zmq_enabled == "false"  %}
+{% if DEVICE_METADATA.localhost.orch_northbond_dash_zmq_enabled != "false"  %}
 DASH_VNET_TABLE
 DASH_QOS_TABLE
 DASH_ENI_TABLE
@@ -23,7 +23,7 @@ DASH_METER_RULE_TABLE
 DASH_ROUTING_APPLIANCE_TABLE
 DASH_ENI_FORWARD_TABLE
 {% endif %}
-{% if DEVICE_METADATA.localhost.orch_route_zmq_enabled == "true"  %}
+{% if DEVICE_METADATA.localhost.orch_northbond_route_zmq_enabled == "true"  %}
 ROUTE_TABLE
 LABEL_ROUTE_TABLE
 {% endif %}
diff --git a/dockers/docker-orchagent/orchagent.sh b/dockers/docker-orchagent/orchagent.sh
index 1f473e9278a..89699101322 100755
--- a/dockers/docker-orchagent/orchagent.sh
+++ b/dockers/docker-orchagent/orchagent.sh
@@ -93,20 +93,23 @@ else
     ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
 fi
 
-# Enable ZMQ for SmartSwitch
+# Enable ZMQ
 LOCALHOST_SUBTYPE=`sonic-db-cli CONFIG_DB hget "DEVICE_METADATA|localhost" "subtype"`
 if [[ x"${LOCALHOST_SUBTYPE}" == x"SmartSwitch" ]]; then
     midplane_mgmt_state=$( ip -json -4 addr show eth0-midplane | jq -r ".[0].operstate" )
     mgmt_ip=$( ip -json -4 addr show eth0 | jq -r ".[0].addr_info[0].local" )
     if [[ $midplane_mgmt_state == "UP" ]]; then
         # Enable ZMQ with eth0-midplane interface name
-        ORCHAGENT_ARGS+=" -q tcp://eth0-midplane:8100"
+        ORCHAGENT_ARGS+=" -q tcp://eth0-midplane"
     elif [[ $mgmt_ip != "" ]] && [[ $mgmt_ip != "null" ]]; then
         # If eth0-midplane interface does not up, enable ZMQ with eth0 address
-        ORCHAGENT_ARGS+=" -q tcp://${mgmt_ip}:8100"
+        ORCHAGENT_ARGS+=" -q tcp://${mgmt_ip}"
     else
-        ORCHAGENT_ARGS+=" -q tcp://127.0.0.1:8100"
+        ORCHAGENT_ARGS+=" -q tcp://127.0.0.1"
     fi
+else
+    # For other platforms, use the default ZMQ address
+    ORCHAGENT_ARGS+=" -q tcp://127.0.0.1"
 fi
 
 # Add VRF parameter when mgmt-vrf enabled
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
index 068c576cfcf..7ab3a70a012 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
@@ -674,7 +674,7 @@
         "sonic-device_metadata:sonic-device_metadata": {
             "sonic-device_metadata:DEVICE_METADATA": {
                 "sonic-device_metadata:localhost": {
-                    "orch_dash_zmq_enabled": true
+                    "orch_northbond_dash_zmq_enabled": true
                 }
             }
         }
@@ -683,7 +683,7 @@
         "sonic-device_metadata:sonic-device_metadata": {
             "sonic-device_metadata:DEVICE_METADATA": {
                 "sonic-device_metadata:localhost": {
-                    "orch_route_zmq_enabled": true
+                    "orch_northbond_route_zmq_enabled": true
                 }
             }
         }
diff --git a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang
index bb5610d7e6e..6c0783a5424 100644
--- a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang
+++ b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang
@@ -300,13 +300,13 @@ module sonic-device_metadata {
                     description "Set source of anchor route";
                 }
 
-                leaf orch_dash_zmq_enabled {
+                leaf orch_northbond_dash_zmq_enabled {
                     type boolean;
                     description "Enable ZMQ feature on APPL_DB DASH tables.";
                     default "true";
                 }
 
-                leaf orch_route_zmq_enabled {
+                leaf orch_northbond_route_zmq_enabled {
                     type boolean;
                     description "Enable ZMQ feature on APPL_DB ROUTE tables.";
                     default "false";