diff --git a/files/build_templates/macsec.service.j2 b/files/build_templates/macsec.service.j2
index 85229d1aea..b8ffbafcbd 100644
--- a/files/build_templates/macsec.service.j2
+++ b/files/build_templates/macsec.service.j2
@@ -2,6 +2,8 @@
 Description=MACsec container
 Requires=swss.service
 After=swss.service syncd.service
+BindsTo=sonic.target
+After=sonic.target
 StartLimitIntervalSec=1200
 StartLimitBurst=3
 
@@ -14,4 +16,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=sonic.target
\ No newline at end of file