diff --git a/client/internal/dns/server.go b/client/internal/dns/server.go
index 8f6e8b572..267c1ed80 100644
--- a/client/internal/dns/server.go
+++ b/client/internal/dns/server.go
@@ -549,9 +549,7 @@ func (s *DefaultServer) upstreamCallbacks(
 
 		if nsGroup.Primary {
 			s.currentConfig.RouteAll = true
-			if runtime.GOOS == "android" {
-				s.service.RegisterMux(nbdns.RootZone, handler)
-			}
+			s.service.RegisterMux(nbdns.RootZone, handler)
 		}
 		if err := s.hostManager.applyDNSConfig(s.currentConfig); err != nil {
 			l.WithError(err).Error("reactivate temporary disabled nameserver group, DNS update apply")
diff --git a/release_files/systemd/netbird-management.service b/release_files/systemd/netbird-management.service
index 7fc0aa9ed..d9e485c73 100644
--- a/release_files/systemd/netbird-management.service
+++ b/release_files/systemd/netbird-management.service
@@ -13,7 +13,7 @@ RestartSec=5
 TimeoutStopSec=10
 CacheDirectory=netbird
 ConfigurationDirectory=netbird
-LogDirectory=netbird
+LogsDirectory=netbird
 RuntimeDirectory=netbird
 StateDirectory=netbird
 
diff --git a/release_files/systemd/netbird-signal.service b/release_files/systemd/netbird-signal.service
index c7e775f49..6333026eb 100644
--- a/release_files/systemd/netbird-signal.service
+++ b/release_files/systemd/netbird-signal.service
@@ -13,7 +13,7 @@ RestartSec=5
 TimeoutStopSec=10
 CacheDirectory=netbird
 ConfigurationDirectory=netbird
-LogDirectory=netbird
+LogsDirectory=netbird
 RuntimeDirectory=netbird
 StateDirectory=netbird
 
diff --git a/release_files/systemd/netbird@.service b/release_files/systemd/netbird@.service
index 39e3b6b23..095c3142d 100644
--- a/release_files/systemd/netbird@.service
+++ b/release_files/systemd/netbird@.service
@@ -13,7 +13,7 @@ RestartSec=5
 TimeoutStopSec=10
 CacheDirectory=netbird
 ConfigurationDirectory=netbird
-LogDirectory=netbird
+LogsDirectory=netbird
 RuntimeDirectory=netbird
 StateDirectory=netbird
 
@@ -28,7 +28,8 @@ ProtectControlGroups=yes
 ProtectHome=yes
 ProtectHostname=yes
 ProtectKernelLogs=yes
-ProtectKernelModules=no  # needed to load wg module for kernel-mode WireGuard
+# needed to load wg module for kernel-mode WireGuard
+ProtectKernelModules=no
 ProtectKernelTunables=no
 ProtectSystem=yes
 RemoveIPC=yes