diff --git a/lib/rdk/factory-reset.sh b/lib/rdk/factory-reset.sh
index dabdbb1a..e294363b 100755
--- a/lib/rdk/factory-reset.sh
+++ b/lib/rdk/factory-reset.sh
@@ -48,7 +48,6 @@ if [ -f /etc/os-release ];then
     /bin/systemctl stop dump-backup.service
     /bin/systemctl stop dnsmasq.service
     /bin/systemctl stop syslog.socket
-    /bin/systemctl stop wpeframework.service
     if [ "$DOBBY_ENABLED" == "true" ]; then
         /bin/systemctl stop dobby.service
     fi
diff --git a/systemd_units/NetworkManager_ecfs.conf b/systemd_units/NetworkManager_ecfs.conf
index dcf4079f..a47863c4 100644
--- a/systemd_units/NetworkManager_ecfs.conf
+++ b/systemd_units/NetworkManager_ecfs.conf
@@ -1,2 +1,3 @@
 [Unit]
-After=securemount.service
+After=securemount.service bootversion-loader.service
+Wants=bootversion-loader.service