diff --git a/system/mmdvm.service b/system/mmdvm.service
index 58f2760..55cf290 100644
--- a/system/mmdvm.service
+++ b/system/mmdvm.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=MMDVMHost
-After=systemd-user-session.service
+Requires=qnrelay.service
+After=systemd-user-session.service qnrelay.service
 
 [Service]
 Type=simple
diff --git a/system/qndvap.service b/system/qndvap.service
index 38031bb..c5ec6fb 100644
--- a/system/qndvap.service
+++ b/system/qndvap.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=QnetDVAP
-After=systemd-user-session.service
+Requires=qngateway.service
+After=systemd-user-session.service qngateway.service
 
 [Service]
 Type=simple
diff --git a/system/qndvrptr.service b/system/qndvrptr.service
index 18869cc..79a15bb 100644
--- a/system/qndvrptr.service
+++ b/system/qndvrptr.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=QnetDVRPTR
-After=systemd-user-session.service
+Requires=qngateway.service
+After=systemd-user-session.service qngateway.service
 
 [Service]
 Type=simple
diff --git a/system/qngateway.service b/system/qngateway.service
index 1068d3c..911ccac 100644
--- a/system/qngateway.service
+++ b/system/qngateway.service
@@ -1,10 +1,12 @@
 [Unit]
 Description=QnetGateway
-After=systemd-user-session.service
+Requires=network.target
+After=systemd-user-session.service network.target
 
 [Service]
 Type=simple
 ExecStart=/usr/local/bin/qngateway /usr/local/etc/qn.cfg
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/system/qnitap.service b/system/qnitap.service
index d3a7e6a..41ec92a 100644
--- a/system/qnitap.service
+++ b/system/qnitap.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=QnetITAP
-After=systemd-user-session.service
+Requires=qngateway.service
+After=systemd-user-session.service qngateway.service
 
 [Service]
 Type=simple
diff --git a/system/qnlink.service b/system/qnlink.service
index 12ca713..f1dbc83 100644
--- a/system/qnlink.service
+++ b/system/qnlink.service
@@ -1,10 +1,12 @@
 [Unit]
 Description=QnetLink
-After=systemd-user-session.service
+Requires=qngateway.service
+After=systemd-user-session.service qngateway.service
 
 [Service]
 Type=simple
 ExecStart=/usr/local/bin/qnlink /usr/local/etc/qn.cfg
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/system/qnrelay.service b/system/qnrelay.service
index 823744d..9dfdf94 100644
--- a/system/qnrelay.service
+++ b/system/qnrelay.service
@@ -1,10 +1,12 @@
 [Unit]
 Description=QnetRelay
-After=systemd-user-session.service
+Requires=qngateway.service
+After=systemd-user-session.service qngateway.service
 
 [Service]
 Type=simple
 ExecStart=/usr/local/bin/qnrelay /usr/local/etc/qn.cfg
+Restart=always
 
 [Install]
 WantedBy=multi-user.target