diff --git a/modules/wireguard-common/default.nix b/modules/wireguard-common/default.nix
index 491bc54..e67cf81 100644
--- a/modules/wireguard-common/default.nix
+++ b/modules/wireguard-common/default.nix
@@ -24,9 +24,4 @@
     privateKeyFile = config.age.secrets."${config.networking.hostName}-wireguard-private-key".path;
     listenPort = 51820;
   };
-
-  networking.hosts = lib.mapAttrs' (hostname: vpnConfig: {
-    name = vpnConfig.ip;
-    value = [ "${hostname}.wg.aciceri.dev" ];
-  }) vpn;
 }
diff --git a/modules/zerotier/default.nix b/modules/zerotier/default.nix
index febcee3..c25f8b6 100644
--- a/modules/zerotier/default.nix
+++ b/modules/zerotier/default.nix
@@ -1,6 +1,14 @@
-{
-  services.zerotierone = {
-    enable = true;
-    joinNetworks = [ "632ea29085af0cb4" ];
-  };
-}
+{ config, lib, ... }:
+lib.mkMerge [
+  {
+    services.zerotierone = {
+      enable = true;
+      joinNetworks = [ "632ea29085af0cb4" ];
+    };
+  }
+  (lib.optionalAttrs (config.networking.hostName == "sisko") {
+    environment.persistence."/persist".directories = [
+      "/var/lib/zerotier-one"
+    ];
+  })
+]