diff --git a/src/config/schema-transformer/config_db.py b/src/config/schema-transformer/config_db.py
index 7102eddc291..c080c12a52a 100644
--- a/src/config/schema-transformer/config_db.py
+++ b/src/config/schema-transformer/config_db.py
@@ -3025,7 +3025,10 @@ def __init__(self, name, obj=None):
     def set_bgpaas_clients(self):
         for bgp_router in self.bgp_routers:
             bgpr = BgpRouterST.get(bgp_router)
-            self.bgpaas_clients[bgpr.obj.name] = bgpr.obj.get_fq_name_str()
+            for vmi in self.virtual_machine_interfaces():
+                if vmi.split(':')[-1] == bgpr.obj.name:
+                    self.bgpaas_clients[vmi] = bgpr.obj.get_fq_name_str()
+                    break
     # end set_bgp_clients
 
     def update(self, obj=None):