diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py
index 9c11ab20f4..8b11f56e25 100755
--- a/scripts/db_migrator.py
+++ b/scripts/db_migrator.py
@@ -613,6 +613,7 @@ def migrate_feature_timer(self):
                 config['delayed'] = state
                 config.pop('has_timer')
                 self.configDB.set_entry('FEATURE', feature, config)
+
     def migrate_route_table(self):
         """
         Handle route table migration. Migrations handled:
@@ -636,6 +637,21 @@ def migrate_route_table(self):
             if 'protocol' not in route_attr:
                 self.appDB.set(self.appDB.APPL_DB, route_key, 'protocol', '')
 
+    def migrate_routing_config_mode(self):
+        # DEVICE_METADATA - synchronous_mode entry
+        if not self.minigraph_data or 'DEVICE_METADATA' not in self.minigraph_data:
+            return
+        device_metadata_old = self.configDB.get_entry('DEVICE_METADATA', 'localhost')
+        device_metadata_new = self.minigraph_data['DEVICE_METADATA']['localhost']
+        # overwrite the routing-config-mode as per minigraph parser
+        # Criteria for update:
+        # if config mode is missing in base OS or if base and target modes are not same
+        #  Eg. in 201811 mode is "unified", and in newer branches mode is "separated" 
+        if ('docker_routing_config_mode' not in device_metadata_old and 'docker_routing_config_mode' in device_metadata_new) or \
+        (device_metadata_old.get('docker_routing_config_mode') != device_metadata_new.get('docker_routing_config_mode')):
+            device_metadata_old['docker_routing_config_mode'] = device_metadata_new.get('docker_routing_config_mode')
+            self.configDB.set_entry('DEVICE_METADATA', 'localhost', device_metadata_old)
+
     def update_edgezone_aggregator_config(self):
         """
         Update cable length configuration in ConfigDB for T0 neighbor interfaces
@@ -1057,6 +1073,8 @@ def common_migration_ops(self):
 
         # Updating edgezone aggregator cable length config for T0 devices
         self.update_edgezone_aggregator_config()
+        # update FRR config mode based on minigraph parser on target image
+        self.migrate_routing_config_mode()
 
     def migrate(self):
         version = self.get_version()
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_0.json
index 4cab434e29..9eedab4abc 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_0.json
@@ -681,7 +681,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_3.json
index 89f46af5c6..3b4092c18e 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_3.json
@@ -681,7 +681,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_0.json
index d7698caccd..321227f774 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_0.json
@@ -762,7 +762,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
         "small_packet_percentage": "100",
diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_3.json
index b9ad1706a8..ac6cc03463 100644
--- a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_3.json
@@ -761,7 +761,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
diff --git a/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_expected.json b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_expected.json
index 946a9812b7..e46be0a4ef 100644
--- a/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_expected.json
+++ b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_expected.json
@@ -22,5 +22,8 @@
         },
     "CONSOLE_SWITCH|console_mgmt": {
             "enabled": "no"
-        }
-}
+        },
+    "DEVICE_METADATA|localhost": {
+        "docker_routing_config_mode": "separated"
+    }
+}
\ No newline at end of file
diff --git a/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_input.json b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_input.json
index bfd870e452..a0b63b567e 100644
--- a/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_input.json
+++ b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_input.json
@@ -1,3 +1,6 @@
 {
+    "DEVICE_METADATA|localhost": {
+        "docker_routing_config_mode": "unified"
+    }
 }
 
diff --git a/tests/db_migrator_input/config_db/empty-config-expected.json b/tests/db_migrator_input/config_db/empty-config-expected.json
index eebe7eafbd..eba0ae3f8b 100644
--- a/tests/db_migrator_input/config_db/empty-config-expected.json
+++ b/tests/db_migrator_input/config_db/empty-config-expected.json
@@ -3,6 +3,7 @@
         "VERSION": "version_3_0_3"
     },
     "DEVICE_METADATA|localhost": {
-        "synchronous_mode": "enable"
+        "synchronous_mode": "enable",
+        "docker_routing_config_mode": "separated"
     }
 }
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_0.json
index f9d6c6ce92..59d0877536 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_0.json
@@ -735,7 +735,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_3.json
index e6cf41110b..5fe2bf31f2 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_3.json
@@ -734,7 +734,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_0.json
index a77c75e9c1..bd11e91362 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_0.json
@@ -828,7 +828,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_3.json
index 81f6b1f1ce..1f9d19c5af 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_3.json
@@ -827,7 +827,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_0.json
index dac897f792..80cb0b4a8e 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_0.json
@@ -740,7 +740,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_3.json
index 76d095e995..e2b89c2a29 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_3.json
@@ -739,7 +739,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_0.json
index 05ca9f95fb..04b851816f 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_0.json
@@ -833,7 +833,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_3.json
index abccee2062..60fd253db3 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_3.json
@@ -832,7 +832,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_0.json
index cae7a8de89..576bb3d906 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_0.json
@@ -735,7 +735,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_3.json
index 9367e7d6df..3adabbb6a6 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_3.json
@@ -734,7 +734,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable" 
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_0.json
index 51f0ab67af..0f867189b3 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_0.json
@@ -828,7 +828,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_3.json
index c2f12ef94c..5fc6f8cfd2 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_3.json
@@ -827,7 +827,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_0.json
index 9aeb0b2b31..6f3903bbff 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_0.json
@@ -735,7 +735,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_3.json
index 52b9c7f58c..7826180866 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_3.json
@@ -734,7 +734,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_0.json
index 6add5489d1..fd88b64fe6 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_0.json
@@ -828,7 +828,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_3.json
index 082bd15765..5d3aa563c3 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_3.json
@@ -827,7 +827,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_0.json
index adf0fb31ac..60327d71ac 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_0.json
@@ -740,7 +740,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_3.json
index 5282b3e73e..5b6304f509 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_3.json
@@ -739,7 +739,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_0.json
index 09df55a46b..c67a2081dd 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_0.json
@@ -833,7 +833,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_3.json
index e20f0dce78..f786f4bbd0 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_3.json
@@ -832,7 +832,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_0.json
index e0f5d3fbb8..3119633f25 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_0.json
@@ -726,7 +726,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_3.json
index 39956f85ed..ad89f64094 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_3.json
@@ -726,7 +726,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_0.json
index b72e1498c4..b8ddd65745 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_0.json
@@ -828,7 +828,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_3.json
index 28b01ee3fb..84db728465 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_3.json
@@ -827,7 +827,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_0.json
index 3b614fe042..8286ced5e4 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_0.json
@@ -740,7 +740,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_3.json
index 7bc0720ec9..a0844eaf5c 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_3.json
@@ -739,7 +739,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_0.json
index a53b1bbda7..a550869908 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_0.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_0.json
@@ -833,7 +833,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_3.json
index 203ac2171f..8a30df2ab8 100644
--- a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_3.json
+++ b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_3.json
@@ -832,7 +832,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {
diff --git a/tests/db_migrator_input/config_db/non-default-config-expected.json b/tests/db_migrator_input/config_db/non-default-config-expected.json
index 13ae7aa2f3..a3b0c1ba2c 100644
--- a/tests/db_migrator_input/config_db/non-default-config-expected.json
+++ b/tests/db_migrator_input/config_db/non-default-config-expected.json
@@ -754,7 +754,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/non-default-config-input.json b/tests/db_migrator_input/config_db/non-default-config-input.json
index 3cdd352729..44ee11f4bf 100644
--- a/tests/db_migrator_input/config_db/non-default-config-input.json
+++ b/tests/db_migrator_input/config_db/non-default-config-input.json
@@ -730,7 +730,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json
index a5126017bf..5181daa057 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json
@@ -207,7 +207,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json
index df58b4e54b..d8deef194f 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json
@@ -123,7 +123,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json
index 7bd0dd25a0..278a40bc0a 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json
@@ -203,7 +203,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-input.json
index b2ea5f52c3..b3bda32f23 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-input.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-input.json
@@ -119,7 +119,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-expected.json
index d1537d3d3d..9c06a186c3 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-expected.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-expected.json
@@ -266,7 +266,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-input.json
index 35fc6a6a92..31f4ae337e 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-input.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-double-pools-input.json
@@ -158,7 +158,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-expected.json
index 4c1518c43a..0b58a6b70d 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-expected.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-expected.json
@@ -261,7 +261,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-input.json
index 408afb409e..85cb241291 100644
--- a/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-input.json
+++ b/tests/db_migrator_input/config_db/reclaiming-buffer-traditional-single-pool-input.json
@@ -158,7 +158,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",
diff --git a/tests/db_migrator_test.py b/tests/db_migrator_test.py
index 02c56f9195..2db9eae0d4 100644
--- a/tests/db_migrator_test.py
+++ b/tests/db_migrator_test.py
@@ -508,6 +508,13 @@ def test_warm_upgrade_to_2_0_2(self):
             diff = DeepDiff(resulting_table, expected_table, ignore_order=True)
             assert not diff
 
+        target_routing_mode_result = dbmgtr.configDB.get_table("DEVICE_METADATA")['localhost']['docker_routing_config_mode']
+        target_routing_mode_expected = expected_db.cfgdb.get_table("DEVICE_METADATA")['localhost']['docker_routing_config_mode']
+        diff = DeepDiff(resulting_table, expected_table, ignore_order=True)
+        assert target_routing_mode_result == target_routing_mode_expected,\
+            "After migration: {}. Expected after migration: {}".format(
+                target_routing_mode_result, target_routing_mode_expected)
+
     def test_warm_upgrade__without_mg_to_2_0_2(self):
         dbconnector.dedicated_dbs['CONFIG_DB'] = os.path.join(mock_db_path, 'config_db', 'cross_branch_upgrade_to_version_2_0_2_input')
         import db_migrator