diff --git a/module/owfs/src/c/owfs_callback.c b/module/owfs/src/c/owfs_callback.c
index 029e5ef..3528985 100644
--- a/module/owfs/src/c/owfs_callback.c
+++ b/module/owfs/src/c/owfs_callback.c
@@ -251,6 +251,7 @@ static void *FS_init(void)
 {
 #endif							/* FUSE_VERSION > 25 */
 	PIDstart();
+	Announce_Systemd();
 	return VOID_RETURN;
 }
 #endif							/* FUSE_VERSION > 22 */
diff --git a/module/owlib/src/c/ow_systemd.c b/module/owlib/src/c/ow_systemd.c
index 48b4e4d..64dcf73 100644
--- a/module/owlib/src/c/ow_systemd.c
+++ b/module/owlib/src/c/ow_systemd.c
@@ -42,7 +42,5 @@ void Setup_Systemd( void )
 // Announce systemd is ready
 void Announce_Systemd( void )
 {
-	if ( Globals.daemon_status == e_daemon_sd ) {
-		sd_notify( 0,"READY=1" ) ;
-	}
+	sd_notify( 0,"READY=1" ) ;
 }
diff --git a/src/scripts/systemd/owfs.service.in b/src/scripts/systemd/owfs.service.in
index 8fb2f76..80b3ffa 100644
--- a/src/scripts/systemd/owfs.service.in
+++ b/src/scripts/systemd/owfs.service.in
@@ -3,8 +3,10 @@ Description=1-wire filesystem FUSE mount
 Documentation=man:owfs(1)
 
 [Service]
-ExecStart=@bindir@/owfs --server=127.0.0.1 --allow_other /run/owfs
-ExecStop=/usr/bin/umount /run/owfs
+Type=notify
+NotifyAccess=all
+ExecStart=@bindir@/owfs --server=127.0.0.1 --allow_other %t/owfs
+ExecStop=/usr/bin/umount %t/owfs
 RuntimeDirectory=owfs
 
 [Install]
diff --git a/src/scripts/systemd/owftpd.service.in b/src/scripts/systemd/owftpd.service.in
index 242e0d3..00c5e18 100644
--- a/src/scripts/systemd/owftpd.service.in
+++ b/src/scripts/systemd/owftpd.service.in
@@ -3,6 +3,8 @@ Description=Anonymous FTP server for 1-wire access
 Documentation=man:owftpd(1)
 
 [Service]
+Type=notify
+NotifyAccess=all
 ExecStart=@bindir@/owftpd --foreground --server=127.0.0.1
 User=ow
 Group=ow
diff --git a/src/scripts/systemd/owhttpd.service.in b/src/scripts/systemd/owhttpd.service.in
index 116ce2a..1c3ff65 100644
--- a/src/scripts/systemd/owhttpd.service.in
+++ b/src/scripts/systemd/owhttpd.service.in
@@ -4,6 +4,8 @@ Documentation=man:owhttpd(1)
 After=avahi-daemon.service
 
 [Service]
+Type=notify
+NotifyAccess=all
 ExecStart=@bindir@/owhttpd --foreground --server=127.0.0.1
 User=ow
 Group=ow
diff --git a/src/scripts/systemd/owserver.service.in b/src/scripts/systemd/owserver.service.in
index e65c67b..fa963ba 100644
--- a/src/scripts/systemd/owserver.service.in
+++ b/src/scripts/systemd/owserver.service.in
@@ -4,6 +4,7 @@ Documentation=man:owserver(1)
 
 [Service]
 Type=notify
+NotifyAccess=all
 ExecStart=@bindir@/owserver --w1
 Restart=on-failure
 #User=ow