diff --git a/setup/start/systemd/unbound.service b/setup/start/systemd/unbound.service
index 85038d6b5..db5147e0a 100644
--- a/setup/start/systemd/unbound.service
+++ b/setup/start/systemd/unbound.service
@@ -2,13 +2,16 @@
 
 [Unit]
 Description=Unbound DNS Resolver
-After=network.target docker.service
+After=network-online.target docker.service
+Before=nss-lookup.target
+Wants=network-online.target nss-lookup.target
 
 [Service]
 PIDFile=/run/unbound.pid
 ExecStart=/usr/sbin/unbound -d
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
+Type=notify
 
 [Install]
 WantedBy=multi-user.target
diff --git a/src/systemd-mount.ejs b/src/systemd-mount.ejs
index b251a651c..e933d8e07 100644
--- a/src/systemd-mount.ejs
+++ b/src/systemd-mount.ejs
@@ -1,7 +1,9 @@
 [Unit]
 Description=mount script for <%= name %>
-Requires=network-online.target unbound.service
-After=network-online.service unbound.service
+<% if ( type === 'cifs' || type === 'nfs' || type === 'sshfs' ) { %>
+Requires=unbound.service
+After=unbound.service
+<% } %>
 
 [Mount]
 What=<%= what %>