diff --git a/devices/nas/default.nix b/devices/nas/default.nix
index ae35832e..603ccccd 100644
--- a/devices/nas/default.nix
+++ b/devices/nas/default.nix
@@ -38,7 +38,11 @@ inputs:
         sshd = {};
         xray =
         {
-          client.dnsmasq = { extraInterfaces = [ "enp3s0" ]; hosts."git.chn.moe" = "127.0.0.1"; };
+          client =
+          {
+            xray.serverName = "xserver2.vps4.chn.moe";
+            dnsmasq = { extraInterfaces = [ "enp3s0" ]; hosts."git.chn.moe" = "127.0.0.1"; };
+          };
           xmuServer = {};
           server.serverName = "xservernas.chn.moe";
         };
diff --git a/devices/vps4/default.nix b/devices/vps4/default.nix
index f0d0f6cb..fd1d0429 100644
--- a/devices/vps4/default.nix
+++ b/devices/vps4/default.nix
@@ -27,7 +27,13 @@ inputs:
       {
         sshd = {};
         fail2ban = {};
-        xray.server = {};
+        xray.server.serverName = "xserver2.vps4.chn.moe";
+        nginx.streamProxy.map = builtins.listToAttrs (builtins.map
+          (site: { name = "${site}.chn.moe"; value.upstream.address = "wg0.nas.chn.moe"; })
+          [
+            "xn--s8w913fdga" "matrix" "send" "git" "grafana" "peertube" "rsshub" "misskey" "synapse" "vaultwarden"
+            "photoprism" "nextcloud" "freshrss" "huginn" "api" "webdav" "chat"
+          ]);
       };
     };
   };
diff --git a/devices/vps6/default.nix b/devices/vps6/default.nix
index f131f1de..97f270d8 100644
--- a/devices/vps6/default.nix
+++ b/devices/vps6/default.nix
@@ -38,13 +38,7 @@ inputs:
           }
           // (builtins.listToAttrs (builtins.map
             (site: { name = "${site}.chn.moe"; value.upstream.address = "wg0.pc.chn.moe"; })
-            [ "xn--qbtm095lrg0bfka60z" ]))
-          // (builtins.listToAttrs (builtins.map
-            (site: { name = "${site}.chn.moe"; value.upstream.address = "wg0.nas.chn.moe"; })
-            [
-              "xn--s8w913fdga" "matrix" "send" "git" "grafana" "peertube" "rsshub" "misskey" "synapse" "vaultwarden"
-              "photoprism" "nextcloud" "freshrss" "huginn" "api" "webdav" "chat"
-            ]));
+            [ "xn--qbtm095lrg0bfka60z" ]));
           applications =
           {
             element.instances."element.chn.moe" = {};
diff --git a/flake/dns/config/chn.moe.nix b/flake/dns/config/chn.moe.nix
index ce2d8012..374ab8a6 100644
--- a/flake/dns/config/chn.moe.nix
+++ b/flake/dns/config/chn.moe.nix
@@ -4,14 +4,17 @@ let
   {
     nas = [ "initrd.nas" ];
     office = [ "srv2-node0" "xserverxmu" ];
-    vps4 = [ "initrd.vps4" "xserver2.vps4" ];
+    vps4 =
+    [
+      "initrd.vps4" "xserver2.vps4"
+      # to nas
+      "git" "grafana" "matrix" "peertube" "send" "vikunja" "铜锣湾" "xservernas" "chat" "freshrss" "huginn" "nextcloud"
+      "photoprism" "rsshub" "vaultwarden" "webdav" "synapse" "misskey" "api"
+    ];
     vps6 =
     [
       "blog" "catalog" "coturn" "element" "initrd.vps6" "sticker" "synapse-admin" "tgapi" "ua" "xserver2"
       "xserver2.vps6"
-      # to nas
-      "git" "grafana" "matrix" "peertube" "send" "vikunja" "铜锣湾" "xservernas" "chat" "freshrss" "huginn" "nextcloud"
-      "photoprism" "rsshub" "vaultwarden" "webdav" "synapse" "misskey" "api"
       # to pc
       "铜锣湾实验室"
     ];