diff --git a/templates/usr/local/lib/systemd/system/validation_daemon_@.service.j2 b/templates/usr/local/lib/systemd/system/validation_daemon_@.service.j2
index 0320af2a5abe22dde59b644a805c9da06ddb96a6..c1a21e72d0b171c530673d51eb352bb5af4ab237 100644
--- a/templates/usr/local/lib/systemd/system/validation_daemon_@.service.j2
+++ b/templates/usr/local/lib/systemd/system/validation_daemon_@.service.j2
@@ -1,6 +1,6 @@
 [Unit]
 Description=Validation Tool Daemon (%i)
-After=network.target
+After=remote-fs.target
 
 [Service]
 ExecStart=/usr/local/bin/validate_workflow.sh \
@@ -42,4 +42,4 @@ Type=simple
 #SystemCallErrorNumber=1337
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
diff --git a/templates/usr/local/lib/systemd/system/validation_daemon_any.socket.j2 b/templates/usr/local/lib/systemd/system/validation_daemon_any.socket.j2
index eae623e849b7cf3452263e2d0d06e507280a1a28..b8cd993c48f1fbb4b1579251ff85fc8c425fe0a5 100644
--- a/templates/usr/local/lib/systemd/system/validation_daemon_any.socket.j2
+++ b/templates/usr/local/lib/systemd/system/validation_daemon_any.socket.j2
@@ -9,4 +9,4 @@ Accept=yes
 ReceiveBuffer=4G
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
diff --git a/templates/usr/local/lib/systemd/system/validation_daemon_any@.service.j2 b/templates/usr/local/lib/systemd/system/validation_daemon_any@.service.j2
index 8a765ff52a45032fb9e2cc9888a3b8b86812f09d..7049206cd577248cae07c0c4a56f5b7ba3f748ad 100644
--- a/templates/usr/local/lib/systemd/system/validation_daemon_any@.service.j2
+++ b/templates/usr/local/lib/systemd/system/validation_daemon_any@.service.j2
@@ -38,4 +38,4 @@ Type=simple
 #SystemCallErrorNumber=1337
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target