diff --git a/etc/systemd/system/nfsd.service b/etc/systemd/system/nfsd.service
index e66d959..b481883 100644
--- a/etc/systemd/system/nfsd.service
+++ b/etc/systemd/system/nfsd.service
@@ -4,6 +4,9 @@ ConditionPathExists=/etc/exports
 Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount
 After=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount
 After=sysinit.target
+After=mxmount.service
+After=network-online.target
+Wants=network-online.target
 Conflicts=shutdown.target
 
 [Service]
@@ -12,7 +15,7 @@ ExecStart=/usr/sbin/rpc.mountd --foreground --manage-gids
 ExecStartPost=/usr/sbin/rpc.nfsd --lease-time 90 --grace-time 90 --no-nfs-version 3 8
 ExecStartPost=bash -c "(sleep 10;exportfs -r;sleep 20;exportfs -r;sleep 30;exportfs -r)&"
 ExecReload=/usr/sbin/exportfs -ra
-ExecStopPost=/usr/sbin/rpc.nfsd 0 ; /usr/sbin/exportfs -ua
+ExecStopPost=/usr/sbin/rpc.nfsd 0
 Restart=always
 
 [Install]