diff --git a/files/build_templates/startup_tsa_tsb.service b/files/build_templates/startup_tsa_tsb.service
index e5bf8223365d..5bc15c62962d 100644
--- a/files/build_templates/startup_tsa_tsb.service
+++ b/files/build_templates/startup_tsa_tsb.service
@@ -2,6 +2,7 @@
 Description= STARTUP TSA-TSB SERVICE
 Requires=updategraph.service database.service
 After=updategraph.service database.service
+Before=bgp.service
 ConditionPathExists=!/etc/sonic/chassisdb.conf
 
 [Service]
diff --git a/files/scripts/startup_tsa_tsb.py b/files/scripts/startup_tsa_tsb.py
index 3733bdd734c3..563a509184bf 100644
--- a/files/scripts/startup_tsa_tsb.py
+++ b/files/scripts/startup_tsa_tsb.py
@@ -77,7 +77,7 @@ def config_tsa():
     return tsa_ena
 
 def config_tsb():
-    logger.log_info("startup_tsa_tsb: Configuring TSB")
+    logger.log_info("Configuring TSB")
     subprocess.check_output(['TSB']).strip()
     tsb_issued = True
     return