diff --git a/ovn_bgp_agent/drivers/openstack/ovn_bgp_driver.py b/ovn_bgp_agent/drivers/openstack/ovn_bgp_driver.py
index b96967e..1e40b89 100644
--- a/ovn_bgp_agent/drivers/openstack/ovn_bgp_driver.py
+++ b/ovn_bgp_agent/drivers/openstack/ovn_bgp_driver.py
@@ -177,7 +177,8 @@ class OVNBGPDriver(driver_api.AgentDriverBase):
                 if not extra_routes.get(bridge):
                     extra_routes[bridge] = (
                         linux_net.ensure_routing_table_for_bridge(
-                            self.ovn_routing_tables, bridge))
+                            self.ovn_routing_tables, bridge,
+                            CONF.bgp_vrf_table_id))
                 vlan_tag = self.sb_idl.get_network_vlan_tag_by_network_name(
                     network)
 
diff --git a/ovn_bgp_agent/tests/unit/drivers/openstack/test_ovn_bgp_driver.py b/ovn_bgp_agent/tests/unit/drivers/openstack/test_ovn_bgp_driver.py
index 45e444f..ed6d93b 100644
--- a/ovn_bgp_agent/tests/unit/drivers/openstack/test_ovn_bgp_driver.py
+++ b/ovn_bgp_agent/tests/unit/drivers/openstack/test_ovn_bgp_driver.py
@@ -133,8 +133,10 @@ class TestOVNBGPDriver(test_base.TestCase):
                           mock.call('bridge1', 2, 11)]
         mock_ensure_arp.assert_has_calls(expected_calls)
 
-        expected_calls = [mock.call({'fake-bridge': 'fake-table'}, 'bridge0'),
-                          mock.call({'fake-bridge': 'fake-table'}, 'bridge1')]
+        expected_calls = [mock.call({'fake-bridge': 'fake-table'}, 'bridge0',
+                                    CONF.bgp_vrf_table_id),
+                          mock.call({'fake-bridge': 'fake-table'}, 'bridge1',
+                                    CONF.bgp_vrf_table_id)]
         mock_routing_bridge.assert_has_calls(expected_calls)
 
         expected_calls = [mock.call('bridge0', 10), mock.call('bridge1', 11)]
diff --git a/ovn_bgp_agent/utils/linux_net.py b/ovn_bgp_agent/utils/linux_net.py
index bcae595..3a942d2 100644
--- a/ovn_bgp_agent/utils/linux_net.py
+++ b/ovn_bgp_agent/utils/linux_net.py
@@ -116,7 +116,7 @@ def ensure_arp_ndp_enabled_for_bridge(bridge, offset, vlan_tag=None):
         enable_proxy_ndp(bridge)
 
 
-def ensure_routing_table_for_bridge(ovn_routing_tables, bridge):
+def ensure_routing_table_for_bridge(ovn_routing_tables, bridge, vrf_table):
     # check a routing table with the bridge name exists on
     # /etc/iproute2/rt_tables
     regex = r'^[0-9]*[\s]*{}$'.format(bridge)
@@ -139,8 +139,9 @@ def ensure_routing_table_for_bridge(ovn_routing_tables, bridge):
         # pick a number between 1 and 252
         try:
             table_number = random.choice(list(
-                set([x for x in range(1, 253)]).difference(
-                    set(existing_routes))))
+                set([x for x in range(1, 253)
+                    if x != int(vrf_table)]).difference(
+                        set(existing_routes))))
         except IndexError:
             LOG.error("No more routing tables available for bridge %s "
                       "at /etc/iproute2/rt_tables", bridge)
@@ -471,10 +472,10 @@ def add_ips_to_dev(nic, ips, clear_local_route_at_table=False):
 
     if clear_local_route_at_table:
         for ip in ips:
+            if ip in already_added_ips:
+                continue
             with pyroute2.NDB() as ndb:
                 oif = ndb.interfaces[nic]['index']
-                if ip in already_added_ips:
-                    continue
                 route = {'table': clear_local_route_at_table,
                          'proto': 2,
                          'scope': 254,