diff --git a/recipes-bsp/mac-address-set/files/mac-address-set.service b/recipes-bsp/mac-address-set/files/mac-address-set.service
index 533ae1d..3fd74da 100644
--- a/recipes-bsp/mac-address-set/files/mac-address-set.service
+++ b/recipes-bsp/mac-address-set/files/mac-address-set.service
@@ -1,8 +1,10 @@
 [Unit]
 After=tibluetooth.service
+Before=NetworkManager.service
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=/usr/bin/mac-address-set
 
 [Install]