diff --git a/templates/systemd.automount.j2 b/templates/systemd.automount.j2
index 9fae9a5..de4b4be 100644
--- a/templates/systemd.automount.j2
+++ b/templates/systemd.automount.j2
@@ -1,6 +1,6 @@
 [Unit]
 Description=Automount {{ item.key }}
-After=network.target
+##After=network.target
 
 [Automount]
 Where={{ item.value.mount }}
diff --git a/templates/systemd.mount.j2 b/templates/systemd.mount.j2
index 8ecb179..63d2c02 100644
--- a/templates/systemd.mount.j2
+++ b/templates/systemd.mount.j2
@@ -1,6 +1,6 @@
 [Unit]
 Description=Mount {{ item.key }}
-After=network.target,network-online.target
+After=network.target network-online.target
 
 [Mount]
 What={{ item.value.share }}