diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix
index ddc01b9..f4c22e6 100644
--- a/hosts/marr/default.nix
+++ b/hosts/marr/default.nix
@@ -107,7 +107,7 @@
       enable = true;
       settings = {
         default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time";
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --remember-user-session --time";
           user = "greeter";
         };
       };
diff --git a/hosts/raptus/headscale/dns.nix b/hosts/raptus/headscale/dns.nix
index bc55bdd..956901c 100644
--- a/hosts/raptus/headscale/dns.nix
+++ b/hosts/raptus/headscale/dns.nix
@@ -5,12 +5,10 @@
       magic_dns = true;
       base_domain = "ts";
 
-      # FIX: shan being down takes down entire tailnet
-      # 1 -> move dns to dedicated device
-      # 2 -> find out if fallback dns's are supported by headscale
       nameservers.global = [
         "100.64.0.4"
       ];
+
       extra_records =
         let
           mkRecords = map (sub: {
diff --git a/hosts/shan/adguard.nix b/hosts/shan/adguard.nix
index e9db22b..73d2993 100644
--- a/hosts/shan/adguard.nix
+++ b/hosts/shan/adguard.nix
@@ -32,7 +32,7 @@ in
           filtering_enabled = true;
         };
         clients = {
-          persistent = [
+          persistent = map (val: val // { use_global_settings = true; }) [
             {
               ids = [
                 "100.64.0.1"