diff --git a/playbooks/sshfs.mount.j2 b/playbooks/sshfs.mount.j2
index 8bad585..d771f8d 100644
--- a/playbooks/sshfs.mount.j2
+++ b/playbooks/sshfs.mount.j2
@@ -8,7 +8,7 @@ WantedBy=default.target
 
 [Mount]
 Type=fuse.sshfs
-What={{ [username,'@',hostname,':',remotepath,item,'/',' ',localpath,item,'/' ]|join() }}
+What={{ [username,'@',hostname,':',remotepath,item,'/' ]|join() }}
 Where={{[ localpath,item,'/']|join() }}
 RestartSec=20
 Restart=on-failure
diff --git a/playbooks/sshfs.service.j2 b/playbooks/sshfs.service.j2
index e7813e9..e88345e 100644
--- a/playbooks/sshfs.service.j2
+++ b/playbooks/sshfs.service.j2
@@ -2,15 +2,18 @@
 Description=SSHFS  Daemon
 After=network-online.target
 Wants=network-online.target
+StartLimitIntervalSec=300
+StartLimitBurst=10
 
 [Install]
 WantedBy=default.target
 
-[Mount]
-Type=fuse.sshfs
-What={{ [username,'@',hostname,':',remotepath,item,'/' ]|join() }}
-Where={{[ localpath,item,'/']|join() }}
-Options=_netdev,reconnect,ServerAliveInterval=30,ServerAliveCountMax=5,x-systemd.automount
-TimeoutSec=120
+[Service]
+Type=exec
+User=sshfs
+Group=www-data
+ExecStart=/usr/bin/sshfs -p {{sshfsport }} -o allow_root {{ [username,'@',hostname,':',remotepath,item,'/',' ',localpath,item,'/' ]|join() }}
+ExecStop=/usr/bin/umount "{{[ localpath,item,'/']|join() }}"
+RestartSec=20
 Restart=on-failure
 
diff --git a/playbooks/sshfs.service.j2.old b/playbooks/sshfs.service.j2.old
deleted file mode 100644
index e88345e..0000000
--- a/playbooks/sshfs.service.j2.old
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=SSHFS  Daemon
-After=network-online.target
-Wants=network-online.target
-StartLimitIntervalSec=300
-StartLimitBurst=10
-
-[Install]
-WantedBy=default.target
-
-[Service]
-Type=exec
-User=sshfs
-Group=www-data
-ExecStart=/usr/bin/sshfs -p {{sshfsport }} -o allow_root {{ [username,'@',hostname,':',remotepath,item,'/',' ',localpath,item,'/' ]|join() }}
-ExecStop=/usr/bin/umount "{{[ localpath,item,'/']|join() }}"
-RestartSec=20
-Restart=on-failure
-