diff --git a/hbbr.service b/hbbr.service
index 8593d94..c43f49e 100644
--- a/hbbr.service
+++ b/hbbr.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=RustDesk Relay server
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
diff --git a/hbbs.service b/hbbs.service
index 31475e1..11d3778 100644
--- a/hbbs.service
+++ b/hbbs.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=RustDesk ID/Rendezvous server
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
diff --git a/rustdesk-server.spec b/rustdesk-server.spec
index 47eac7f..c6f6e29 100644
--- a/rustdesk-server.spec
+++ b/rustdesk-server.spec
@@ -35,7 +35,7 @@ BuildRequires:  openssl-devel
 BuildRequires:  systemd-rpm-macros
 Requires:       firewalld-filesystem
 %{?systemd_requires}
-%sysusers_requires
+%{?sysusers_requires_compat}
 
 %description
 RustDesk Server Program. Includes the hbbs (RustDesk ID/Rendezvous server)
@@ -80,7 +80,7 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 
 %pre
-%sysusers_create_compat %{name}.conf
+%sysusers_create_compat %{SOURCE6}
 
 %post
 %systemd_post hbbs.service hbbr.service
@@ -102,7 +102,7 @@ systemd-tmpfiles --create %{name}.conf || :
 %{_unitdir}/hbbr.service
 %{_sysusersdir}/%{name}.conf
 %{_tmpfilesdir}/%{name}.conf
-%dir %{_sharedstatedir}/%{name}
+%attr(0750, rustdesk, rustdesk) %dir %{_sharedstatedir}/%{name}
 
 %changelog
 * Tue May 12 2026 Jason Rothstein