diff --git a/.github/update.log b/.github/update.log
index c7d8fda0b8..ec8c7a3582 100644
--- a/.github/update.log
+++ b/.github/update.log
@@ -616,3 +616,4 @@ Update On Wed Apr 10 20:31:24 CEST 2024
 Update On Thu Apr 11 20:26:19 CEST 2024
 Update On Fri Apr 12 20:24:06 CEST 2024
 Update On Sat Apr 13 20:24:55 CEST 2024
+Update On Mon Apr 15 01:03:26 CEST 2024
diff --git a/clash-nyanpasu/.eslintrc.cjs b/clash-nyanpasu/.eslintrc.cjs
index c5c9f176a6..c5391b4dd2 100644
--- a/clash-nyanpasu/.eslintrc.cjs
+++ b/clash-nyanpasu/.eslintrc.cjs
@@ -19,6 +19,7 @@ module.exports = {
     "@typescript-eslint/no-unused-vars": "warn",
     "@typescript-eslint/no-explicit-any": "warn",
     "react/react-in-jsx-scope": "off",
+    "@typescript-eslint/no-namespace": "off",
   },
   settings: {
     react: {
diff --git a/clash-nyanpasu/frontend/interface/ipc/index.ts b/clash-nyanpasu/frontend/interface/ipc/index.ts
index f122a8dc71..ec5575d1ea 100644
--- a/clash-nyanpasu/frontend/interface/ipc/index.ts
+++ b/clash-nyanpasu/frontend/interface/ipc/index.ts
@@ -1 +1,2 @@
 export * from "./useNyanpasu";
+export * from "./useClash";
diff --git a/clash-nyanpasu/frontend/interface/ipc/useClash.ts b/clash-nyanpasu/frontend/interface/ipc/useClash.ts
new file mode 100644
index 0000000000..8bbccfdd84
--- /dev/null
+++ b/clash-nyanpasu/frontend/interface/ipc/useClash.ts
@@ -0,0 +1,27 @@
+import useSWR from "swr";
+import { clash } from "../service/clash";
+
+export const useClash = () => {
+  const { setConfigs, setProxies, deleteConnections, ...api } = clash();
+
+  const getConfigs = useSWR("getClashConfig", api.getConfigs);
+
+  const getVersion = useSWR("getClashVersion", api.getVersion);
+
+  const getRules = useSWR("getClashRules", api.getRules);
+
+  const getProxiesDelay = useSWR("getClashProxiesDelay", api.getProxiesDelay);
+
+  const getProxies = useSWR("getClashProxies", api.getProxies);
+
+  return {
+    getConfigs,
+    setConfigs,
+    getVersion,
+    getRules,
+    getProxiesDelay,
+    getProxies,
+    setProxies,
+    deleteConnections,
+  };
+};
diff --git a/clash-nyanpasu/frontend/interface/package.json b/clash-nyanpasu/frontend/interface/package.json
index f0249134cd..0a5f721223 100644
--- a/clash-nyanpasu/frontend/interface/package.json
+++ b/clash-nyanpasu/frontend/interface/package.json
@@ -5,6 +5,7 @@
   "module": "index.ts",
   "dependencies": {
     "@tauri-apps/api": "1.5.3",
+    "ofetch": "1.3.4",
     "swr": "2.2.5"
   }
 }
diff --git a/clash-nyanpasu/frontend/interface/service/clash.ts b/clash-nyanpasu/frontend/interface/service/clash.ts
new file mode 100644
index 0000000000..6290b3fff1
--- /dev/null
+++ b/clash-nyanpasu/frontend/interface/service/clash.ts
@@ -0,0 +1,146 @@
+import { ofetch } from "ofetch";
+import { getClashInfo } from "./tauri";
+
+export namespace Clash {
+  export interface Config {
+    port: number;
+    mode: string;
+    ipv6: boolean;
+    "socket-port": number;
+    "allow-lan": boolean;
+    "log-level": string;
+    "mixed-port": number;
+    "redir-port": number;
+    "socks-port": number;
+    "tproxy-port": number;
+    "external-controller": string;
+    secret: string;
+  }
+
+  export interface Version {
+    premium: boolean;
+    meta?: boolean;
+    version: string;
+  }
+
+  export interface Rule {
+    type: string;
+    payload: string;
+    proxy: string;
+  }
+
+  export interface Proxy {
+    name: string;
+    type: string;
+    udp: boolean;
+    history: {
+      time: string;
+      delay: number;
+    }[];
+    all?: string[];
+    now?: string;
+    provider?: string;
+  }
+}
+
+const prepareServer = (server: string) => {
+  if (server.startsWith(":")) {
+    return `127.0.0.1${server}`;
+  } else if (/^\d+$/.test(server)) {
+    return `127.0.0.1:${server}`;
+  } else {
+    return server;
+  }
+};
+
+export const clash = () => {
+  const buildRequest = async () => {
+    const info = await getClashInfo();
+
+    return ofetch.create({
+      baseURL: `http://${prepareServer(info?.server as string)}`,
+      headers: info?.secret
+        ? { Authorization: `Bearer ${info?.secret}` }
+        : undefined,
+    });
+  };
+
+  const getConfigs = async () => {
+    return (await buildRequest())<Clash.Config>("/configs");
+  };
+
+  const setConfigs = async (config: Partial<Clash.Config>) => {
+    return (await buildRequest())<Clash.Config>("/configs", {
+      method: "PATCH",
+      body: config,
+    });
+  };
+
+  const getVersion = async () => {
+    return (await buildRequest())<Clash.Version>("/version");
+  };
+
+  const getRules = async () => {
+    interface PrivateRule {
+      rules: Clash.Rule[];
+    }
+
+    return (await buildRequest())<PrivateRule>("/rules");
+  };
+
+  const getProxiesDelay = async (
+    name: string,
+    options?: {
+      url?: string;
+      timeout?: number;
+    },
+  ) => {
+    return (await buildRequest())<{ delay: number }>(
+      `/proxies/${encodeURIComponent(name)}/delay`,
+      {
+        params: {
+          timeout: options?.timeout || 10000,
+          url: options?.url || "http://www.gstatic.com/generate_204",
+        },
+      },
+    );
+  };
+
+  const getProxies = async () => {
+    interface PrivateProxy {
+      proxies: Clash.Proxy[];
+    }
+
+    return (await buildRequest())<PrivateProxy>("/proxies");
+  };
+
+  const setProxies = async ({
+    group,
+    proxy,
+  }: {
+    group: string;
+    proxy: string;
+  }) => {
+    return (await buildRequest())(`/proxies/${encodeURIComponent(group)}`, {
+      method: "PUT",
+      body: { name: proxy },
+    });
+  };
+
+  const deleteConnections = async () => {
+    return (await buildRequest())(`/connections`, {
+      method: "DELETE",
+    });
+  };
+
+  return {
+    getConfigs,
+    setConfigs,
+    getVersion,
+    getRules,
+    getProxiesDelay,
+    getProxies,
+    setProxies,
+    deleteConnections,
+  };
+};
diff --git a/clash-nyanpasu/frontend/interface/service/index.ts b/clash-nyanpasu/frontend/interface/service/index.ts
index c758311d3e..257a6f7b86 100644
--- a/clash-nyanpasu/frontend/interface/service/index.ts
+++ b/clash-nyanpasu/frontend/interface/service/index.ts
@@ -1,2 +1,3 @@
 export * from "./types";
 export * from "./tauri";
+export * from "./clash";
diff --git a/clash-nyanpasu/frontend/interface/service/tauri.ts b/clash-nyanpasu/frontend/interface/service/tauri.ts
index 8359bee451..b5d91d4e58 100644
--- a/clash-nyanpasu/frontend/interface/service/tauri.ts
+++ b/clash-nyanpasu/frontend/interface/service/tauri.ts
@@ -1,5 +1,5 @@
 import { invoke } from "@tauri-apps/api/tauri";
-import { VergeConfig } from "./types";
+import { ClashInfo, VergeConfig } from "./types";
 
 export const nyanpasuConfig = {
   get: async () => {
@@ -10,3 +10,7 @@ export const nyanpasuConfig = {
     return await invoke<void>("patch_verge_config", { payload });
   },
 };
+
+export const getClashInfo = async () => {
+  return await invoke<ClashInfo | null>("get_clash_info");
+};
diff --git a/clash-nyanpasu/frontend/interface/service/types.ts b/clash-nyanpasu/frontend/interface/service/types.ts
index 3595d0a336..3ae8a2554d 100644
--- a/clash-nyanpasu/frontend/interface/service/types.ts
+++ b/clash-nyanpasu/frontend/interface/service/types.ts
@@ -44,3 +44,9 @@ export interface VergeConfig {
     external_controller_port_strategy: "fixed" | "random" | "allow_fallback";
   };
 }
+
+export interface ClashInfo {
+  port?: number;
+  server?: string;
+  secret?: string;
+}
diff --git a/clash-nyanpasu/frontend/nyanpasu/package.json b/clash-nyanpasu/frontend/nyanpasu/package.json
index ed31c5dcc3..c3b632a854 100644
--- a/clash-nyanpasu/frontend/nyanpasu/package.json
+++ b/clash-nyanpasu/frontend/nyanpasu/package.json
@@ -14,7 +14,7 @@
     "@dnd-kit/utilities": "3.2.2",
     "@emotion/react": "11.11.4",
     "@emotion/styled": "11.11.5",
-    "@generouted/react-router": "1.19.2",
+    "@generouted/react-router": "1.19.3",
     "@juggle/resize-observer": "3.4.0",
     "@mui/icons-material": "5.15.15",
     "@mui/lab": "5.0.0-alpha.170",
diff --git a/clash-nyanpasu/frontend/nyanpasu/src/pages/proxies.tsx b/clash-nyanpasu/frontend/nyanpasu/src/pages/proxies.tsx
index 755ed0e4e6..2569d052b6 100644
--- a/clash-nyanpasu/frontend/nyanpasu/src/pages/proxies.tsx
+++ b/clash-nyanpasu/frontend/nyanpasu/src/pages/proxies.tsx
@@ -1,57 +1,45 @@
 import { BasePage } from "@/components/base";
 import { ProviderButton } from "@/components/proxy/provider-button";
 import { ProxyGroups } from "@/components/proxy/proxy-groups";
-import { useVerge } from "@/hooks/use-verge";
-import {
-  closeAllConnections,
-  getClashConfig,
-  updateConfigs,
-} from "@/services/api";
-import { patchClashConfig } from "@/services/cmds";
-import { Box, Button, ButtonGroup, Paper } from "@mui/material";
+import { Box, Button, ButtonGroup } from "@mui/material";
 import { useLockFn } from "ahooks";
 import { useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import useSWR from "swr";
+import { useNyanpasu, useClash } from "@nyanpasu/interface";
 
 export default function ProxyPage() {
   const { t } = useTranslation();
 
-  const { data: clashConfig, mutate: mutateClash } = useSWR(
-    "getClashConfig",
-    getClashConfig,
-  );
+  const { nyanpasuConfig } = useNyanpasu();
 
-  const { verge } = useVerge();
+  const { getConfigs, setConfigs, deleteConnections } = useClash();
 
   const modeList = useMemo(() => {
-    if (
-      verge?.clash_core === "mihomo" ||
-      verge?.clash_core === "mihomo-alpha" ||
-      verge?.clash_core === "clash-rs"
-    ) {
-      return ["rule", "global", "direct"];
-    }
-    return ["rule", "global", "direct", "script"];
-  }, [verge?.clash_core]);
+    const defaultModes = ["rule", "global", "direct"];
 
-  const curMode = clashConfig?.mode?.toLowerCase();
+    return ["mihomo", "mihomo-alpha", "clash-rs"].includes(
+      nyanpasuConfig?.clash_core,
+    )
+      ? defaultModes
+      : [...defaultModes, "script"];
+  }, [nyanpasuConfig?.clash_core]);
 
-  const onChangeMode = useLockFn(async (mode: string) => {
-    // 断开连接
-    if (mode !== curMode && verge?.auto_close_connection) {
-      closeAllConnections();
+  const currentMode = getConfigs.data?.mode?.toLowerCase();
+
+  const onChangeMode = useLockFn(async (mode) => {
+    if (mode !== currentMode && nyanpasuConfig?.auto_close_connection) {
+      await deleteConnections();
     }
-    await updateConfigs({ mode });
-    await patchClashConfig({ mode });
-    mutateClash();
+
+    await setConfigs({ mode });
+    await getConfigs.mutate();
   });
 
   useEffect(() => {
-    if (curMode && !modeList.includes(curMode)) {
+    if (currentMode && !modeList.includes(currentMode)) {
       onChangeMode("rule");
     }
-  }, [curMode]);
+  }, [currentMode, modeList, onChangeMode]);
 
   return (
     <BasePage
@@ -66,7 +54,7 @@ export default function ProxyPage() {
             {modeList.map((mode) => (
               <Button
                 key={mode}
-                variant={mode === curMode ? "contained" : "outlined"}
+                variant={mode === currentMode ? "contained" : "outlined"}
                 onClick={() => onChangeMode(mode)}
                 sx={{ textTransform: "capitalize" }}
               >
@@ -77,7 +65,7 @@ export default function ProxyPage() {
         </Box>
       }
     >
-      <ProxyGroups mode={curMode!} />
+      <ProxyGroups mode={currentMode!} />
     </BasePage>
   );
 }
diff --git a/clash-nyanpasu/manifest/version.json b/clash-nyanpasu/manifest/version.json
index 50ef505de5..d7b4fcda3d 100644
--- a/clash-nyanpasu/manifest/version.json
+++ b/clash-nyanpasu/manifest/version.json
@@ -2,7 +2,7 @@
   "manifest_version": 1,
   "latest": {
     "mihomo": "v1.18.3",
-    "mihomo_alpha": "alpha-6f0fe85",
+    "mihomo_alpha": "alpha-d84f88b",
     "clash_rs": "v0.1.16",
     "clash_premium": "2023-09-05-gdcc8d87"
   },
@@ -12,14 +12,14 @@
       "linux-aarch64": "mihomo-linux-arm64-{}.gz",
       "linux-amd64": "mihomo-linux-amd64-compatible-{}.gz",
       "darwin-arm64": "mihomo-darwin-arm64-{}.gz",
-      "darwin-x64": "mihomo-darwin-amd64-{}.gz"
+      "darwin-x64": "mihomo-darwin-amd64-compatible-{}.gz"
     },
     "mihomo_alpha": {
       "windows-x86_64": "mihomo-windows-amd64-compatible-{}.zip",
       "linux-aarch64": "mihomo-linux-arm64-{}.gz",
       "linux-amd64": "mihomo-linux-amd64-compatible-{}.gz",
       "darwin-arm64": "mihomo-darwin-arm64-{}.gz",
-      "darwin-x64": "mihomo-darwin-amd64-{}.gz"
+      "darwin-x64": "mihomo-darwin-amd64-compatible-{}.gz"
     },
     "clash_rs": {
       "windows-x86_64": "clash-x86_64-pc-windows-msvc.exe",
@@ -36,5 +36,5 @@
       "darwin-x64": "clash-darwin-amd64-n{}.gz"
     }
   },
-  "updated_at": "2024-04-12T22:18:27.892Z"
+  "updated_at": "2024-04-13T22:18:27.726Z"
 }
diff --git a/clash-nyanpasu/package.json b/clash-nyanpasu/package.json
index 45539b6445..ee0b4e1597 100644
--- a/clash-nyanpasu/package.json
+++ b/clash-nyanpasu/package.json
@@ -71,8 +71,8 @@
     "lodash-es": "4.17.21"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.2.1",
-    "@commitlint/config-conventional": "19.1.0",
+    "@commitlint/cli": "19.2.2",
+    "@commitlint/config-conventional": "19.2.2",
     "@tauri-apps/cli": "1.5.11",
     "@types/fs-extra": "11.0.4",
     "@types/lodash-es": "4.17.12",
diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml
index e684de9880..8a28eb65f0 100644
--- a/clash-nyanpasu/pnpm-lock.yaml
+++ b/clash-nyanpasu/pnpm-lock.yaml
@@ -19,11 +19,11 @@ importers:
         version: 4.17.21
     devDependencies:
       '@commitlint/cli':
-        specifier: 19.2.1
-        version: 19.2.1(@types/node@20.12.7)(typescript@5.4.5)
+        specifier: 19.2.2
+        version: 19.2.2(@types/node@20.12.7)(typescript@5.4.5)
       '@commitlint/config-conventional':
-        specifier: 19.1.0
-        version: 19.1.0
+        specifier: 19.2.2
+        version: 19.2.2
       '@tauri-apps/cli':
         specifier: 1.5.11
         version: 1.5.11
@@ -135,6 +135,9 @@ importers:
       '@tauri-apps/api':
         specifier: 1.5.3
         version: 1.5.3
+      ofetch:
+        specifier: 1.3.4
+        version: 1.3.4
       swr:
         specifier: 2.2.5
         version: 2.2.5(react@18.2.0)
@@ -157,8 +160,8 @@ importers:
         specifier: 11.11.5
         version: 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.78)(react@18.2.0)
       '@generouted/react-router':
-        specifier: 1.19.2
-        version: 1.19.2(react-router-dom@6.22.3)(react@18.2.0)(vite@5.2.8)
+        specifier: 1.19.3
+        version: 1.19.3(react-router-dom@6.22.3)(react@18.2.0)(vite@5.2.8)
       '@juggle/resize-observer':
         specifier: 3.4.0
         version: 3.4.0
@@ -562,13 +565,13 @@ packages:
       '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
-  /@commitlint/cli@19.2.1(@types/node@20.12.7)(typescript@5.4.5):
-    resolution: {integrity: sha512-cbkYUJsLqRomccNxvoJTyv5yn0bSy05BBizVyIcLACkRbVUqYorC351Diw/XFSWC/GtpwiwT2eOvQgFZa374bg==}
+  /@commitlint/cli@19.2.2(@types/node@20.12.7)(typescript@5.4.5):
+    resolution: {integrity: sha512-P8cbOHfg2PQRzfICLSrzUVOCVMqjEZ8Hlth6mtJ4yOEjT47Q5PbIGymgX3rLVylNw+3IAT2Djn9IJ2wHbXFzBg==}
     engines: {node: '>=v18'}
     hasBin: true
     dependencies:
       '@commitlint/format': 19.0.3
-      '@commitlint/lint': 19.1.0
+      '@commitlint/lint': 19.2.2
       '@commitlint/load': 19.2.0(@types/node@20.12.7)(typescript@5.4.5)
       '@commitlint/read': 19.2.1
       '@commitlint/types': 19.0.3
@@ -579,8 +582,8 @@ packages:
       - typescript
     dev: true
 
-  /@commitlint/config-conventional@19.1.0:
-    resolution: {integrity: sha512-KIKD2xrp6Uuk+dcZVj3++MlzIr/Su6zLE8crEDQCZNvWHNQSeeGbzOlNtsR32TUy6H3JbP7nWgduAHCaiGQ6EA==}
+  /@commitlint/config-conventional@19.2.2:
+    resolution: {integrity: sha512-mLXjsxUVLYEGgzbxbxicGPggDuyWNkf25Ht23owXIH+zV2pv1eJuzLK3t1gDY5Gp6pxdE60jZnWUY5cvgL3ufw==}
     engines: {node: '>=v18'}
     dependencies:
       '@commitlint/types': 19.0.3
@@ -620,19 +623,19 @@ packages:
       chalk: 5.3.0
     dev: true
 
-  /@commitlint/is-ignored@19.0.3:
-    resolution: {integrity: sha512-MqDrxJaRSVSzCbPsV6iOKG/Lt52Y+PVwFVexqImmYYFhe51iVJjK2hRhOG2jUAGiUHk4jpdFr0cZPzcBkSzXDQ==}
+  /@commitlint/is-ignored@19.2.2:
+    resolution: {integrity: sha512-eNX54oXMVxncORywF4ZPFtJoBm3Tvp111tg1xf4zWXGfhBPKpfKG6R+G3G4v5CPlRROXpAOpQ3HMhA9n1Tck1g==}
     engines: {node: '>=v18'}
     dependencies:
       '@commitlint/types': 19.0.3
       semver: 7.6.0
     dev: true
 
-  /@commitlint/lint@19.1.0:
-    resolution: {integrity: sha512-ESjaBmL/9cxm+eePyEr6SFlBUIYlYpI80n+Ltm7IA3MAcrmiP05UMhJdAD66sO8jvo8O4xdGn/1Mt2G5VzfZKw==}
+  /@commitlint/lint@19.2.2:
+    resolution: {integrity: sha512-xrzMmz4JqwGyKQKTpFzlN0dx0TAiT7Ran1fqEBgEmEj+PU98crOFtysJgY+QdeSagx6EDRigQIXJVnfrI0ratA==}
     engines: {node: '>=v18'}
     dependencies:
-      '@commitlint/is-ignored': 19.0.3
+      '@commitlint/is-ignored': 19.2.2
       '@commitlint/parse': 19.0.3
       '@commitlint/rules': 19.0.3
       '@commitlint/types': 19.0.3
@@ -1388,15 +1391,15 @@ packages:
     resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==}
     dev: false
 
-  /@generouted/react-router@1.19.2(react-router-dom@6.22.3)(react@18.2.0)(vite@5.2.8):
-    resolution: {integrity: sha512-glHSqsrXZ7t524PgmQOD+fuxFVIuFOyAsYkPI+lbuskGm7Us/FknrkuxiuS4b5wPpHapDnOCChqLdumwvRxBng==}
+  /@generouted/react-router@1.19.3(react-router-dom@6.22.3)(react@18.2.0)(vite@5.2.8):
+    resolution: {integrity: sha512-3/Y0j302HnwxyU0KOoCOFSVwJZN4eD73+CVtSaOKUnLbGW1ftP1dT8Eur14PALGvZOVR4gsFrUJFq6a4c/kWvQ==}
     peerDependencies:
       react: '>=18'
       react-router-dom: '>=6'
       vite: '>=4'
     dependencies:
       fast-glob: 3.3.2
-      generouted: 1.19.2(vite@5.2.8)
+      generouted: 1.19.3(vite@5.2.8)
       react: 18.2.0
       react-router-dom: 6.22.3(react-dom@18.2.0)(react@18.2.0)
       vite: 5.2.8(@types/node@20.12.7)(sass@1.75.0)
@@ -3293,6 +3296,10 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
+  /destr@2.0.3:
+    resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==}
+    dev: false
+
   /devlop@1.1.0:
     resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
     dependencies:
@@ -4157,8 +4164,8 @@ packages:
     resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
     dev: true
 
-  /generouted@1.19.2(vite@5.2.8):
-    resolution: {integrity: sha512-kldS/yjNkjytPlQ1m44Gm98NCV1gWmgKJXM+pdtcIEp+x7V2JJTKs86N7jAMH0omnBe9GrhVj5OqtuN8x+VjZA==}
+  /generouted@1.19.3(vite@5.2.8):
+    resolution: {integrity: sha512-1KnOmPYBNryAm+9PvvOTOzKiWvuBKRwK+Xr4dP/I9U00y7UAv/VrFGeb0v7mYMiny6jpWBmfBFKaUvq4Q0Z4dQ==}
     peerDependencies:
       vite: '>=3'
     dependencies:
@@ -5516,6 +5523,10 @@ packages:
     engines: {node: '>=10.5.0'}
     dev: true
 
+  /node-fetch-native@1.6.4:
+    resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==}
+    dev: false
+
   /node-fetch@2.7.0:
     resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
     engines: {node: 4.x || >=6.0.0}
@@ -5649,6 +5660,14 @@ packages:
       es-abstract: 1.22.5
     dev: true
 
+  /ofetch@1.3.4:
+    resolution: {integrity: sha512-KLIET85ik3vhEfS+3fDlc/BAZiAp+43QEC/yCo5zkNoY2YaKvNkOaFr/6wCFgFH1kuYQM5pMNi0Tg8koiIemtw==}
+    dependencies:
+      destr: 2.0.3
+      node-fetch-native: 1.6.4
+      ufo: 1.5.3
+    dev: false
+
   /once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
@@ -6960,6 +6979,10 @@ packages:
     hasBin: true
     dev: true
 
+  /ufo@1.5.3:
+    resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==}
+    dev: false
+
   /unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
     dependencies:
diff --git a/clash-nyanpasu/scripts/check.ts b/clash-nyanpasu/scripts/check.ts
index b1d3c26ba1..d37c94e771 100644
--- a/clash-nyanpasu/scripts/check.ts
+++ b/clash-nyanpasu/scripts/check.ts
@@ -72,7 +72,7 @@ const MIHOMO_VERSION = versionManifest.latest.mihomo;
 const MIHOMO_URL_PREFIX = `https://github.com/MetaCubeX/mihomo/releases/download/${MIHOMO_VERSION}`;
 const MIHOMO_MAP = {
   "win32-x64": "mihomo-windows-amd64-compatible",
-  "darwin-x64": "mihomo-darwin-amd64",
+  "darwin-x64": "mihomo-darwin-amd64-compatible",
   "darwin-arm64": "mihomo-darwin-arm64",
   "linux-x64": "mihomo-linux-amd64-compatible",
   "linux-arm64": "mihomo-linux-arm64",
@@ -85,7 +85,7 @@ let MIHOMO_ALPHA_VERSION = versionManifest.latest.mihomo_alpha;
 const MIHOMO_ALPHA_URL_PREFIX = `https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha`;
 const MIHOMO_ALPHA_MAP = {
   "win32-x64": "mihomo-windows-amd64-compatible",
-  "darwin-x64": "mihomo-darwin-amd64",
+  "darwin-x64": "mihomo-darwin-amd64-compatible",
   "darwin-arm64": "mihomo-darwin-arm64",
   "linux-x64": "mihomo-linux-amd64-compatible",
   "linux-arm64": "mihomo-linux-arm64",
diff --git a/clash-nyanpasu/scripts/generate-latest-version.ts b/clash-nyanpasu/scripts/generate-latest-version.ts
index 28d0518537..b50c8d0cd8 100644
--- a/clash-nyanpasu/scripts/generate-latest-version.ts
+++ b/clash-nyanpasu/scripts/generate-latest-version.ts
@@ -72,7 +72,7 @@ const resolveMihomo: LatestVersionResolver = async () => {
     [SupportedArch.LinuxAarch64]: "mihomo-linux-arm64-{}.gz",
     [SupportedArch.LinuxAmd64]: "mihomo-linux-amd64-compatible-{}.gz",
     [SupportedArch.DarwinArm64]: "mihomo-darwin-arm64-{}.gz",
-    [SupportedArch.DarwinX64]: "mihomo-darwin-amd64-{}.gz",
+    [SupportedArch.DarwinX64]: "mihomo-darwin-amd64-compatible-{}.gz",
   } satisfies ArchMapping;
   return {
     name: "mihomo",
@@ -95,7 +95,7 @@ const resolveMihomoAlpha: LatestVersionResolver = async () => {
     [SupportedArch.LinuxAarch64]: "mihomo-linux-arm64-{}.gz",
     [SupportedArch.LinuxAmd64]: "mihomo-linux-amd64-compatible-{}.gz",
     [SupportedArch.DarwinArm64]: "mihomo-darwin-arm64-{}.gz",
-    [SupportedArch.DarwinX64]: "mihomo-darwin-amd64-{}.gz",
+    [SupportedArch.DarwinX64]: "mihomo-darwin-amd64-compatible-{}.gz",
   } satisfies ArchMapping;
   return {
     name: "mihomo_alpha",
diff --git a/lede/include/kernel-6.6 b/lede/include/kernel-6.6
index 04a23c4e11..768285e092 100644
--- a/lede/include/kernel-6.6
+++ b/lede/include/kernel-6.6
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .26
-LINUX_KERNEL_HASH-6.6.26 = af54b449f4fb93b8e8daa346144a7309e8e95174bd962c4b5917cf56120456d9
+LINUX_VERSION-6.6 = .27
+LINUX_KERNEL_HASH-6.6.27 = 639e50060e3c8f23ed017cb10cfeacc6ba88ff5583812bb76859b4cc6a128291
diff --git a/lede/package/kernel/linux/modules/netdevices.mk b/lede/package/kernel/linux/modules/netdevices.mk
index 203bbdda18..16fb2d70ce 100644
--- a/lede/package/kernel/linux/modules/netdevices.mk
+++ b/lede/package/kernel/linux/modules/netdevices.mk
@@ -142,7 +142,7 @@ $(eval $(call KernelPackage,mii))
 define KernelPackage/mdio-devres
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Supports MDIO device registration
-  DEPENDS:=@!LINUX_5_4 +kmod-libphy +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_malta||TARGET_tegra):kmod-of-mdio
+  DEPENDS:=@!LINUX_5_4 +kmod-libphy +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_loongarch64||TARGET_malta||TARGET_tegra):kmod-of-mdio
   KCONFIG:=CONFIG_MDIO_DEVRES
   HIDDEN:=1
   FILES:=$(LINUX_DIR)/drivers/net/phy/mdio_devres.ko
@@ -159,7 +159,7 @@ $(eval $(call KernelPackage,mdio-devres))
 define KernelPackage/mdio-gpio
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:= Supports GPIO lib-based MDIO busses
-  DEPENDS:=+kmod-libphy @GPIO_SUPPORT +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_malta||TARGET_tegra):kmod-of-mdio
+  DEPENDS:=+kmod-libphy @GPIO_SUPPORT +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_loongarch64||TARGET_malta||TARGET_tegra):kmod-of-mdio
   KCONFIG:= \
 	CONFIG_MDIO_BITBANG \
 	CONFIG_MDIO_GPIO
@@ -475,7 +475,7 @@ $(eval $(call KernelPackage,switch-rtl8306))
 define KernelPackage/switch-rtl8366-smi
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Realtek RTL8366 SMI switch interface support
-  DEPENDS:=@GPIO_SUPPORT +kmod-swconfig +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_malta||TARGET_tegra):kmod-of-mdio
+  DEPENDS:=@GPIO_SUPPORT +kmod-swconfig +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_loongarch64||TARGET_malta||TARGET_tegra):kmod-of-mdio
   KCONFIG:=CONFIG_RTL8366_SMI
   FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8366_smi.ko
   AUTOLOAD:=$(call AutoLoad,42,rtl8366_smi,1)
diff --git a/lede/target/linux/generic/backport-6.6/714-v6.8-02-net-phy-extend-PHY-package-API-to-support-multiple-g.patch b/lede/target/linux/generic/backport-6.6/714-v6.8-02-net-phy-extend-PHY-package-API-to-support-multiple-g.patch
index b95f15a581..68f855283e 100644
--- a/lede/target/linux/generic/backport-6.6/714-v6.8-02-net-phy-extend-PHY-package-API-to-support-multiple-g.patch
+++ b/lede/target/linux/generic/backport-6.6/714-v6.8-02-net-phy-extend-PHY-package-API-to-support-multiple-g.patch
@@ -121,7 +121,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  u32 vsc85xx_csr_read(struct phy_device *phydev,
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1650,20 +1650,22 @@ EXPORT_SYMBOL_GPL(phy_driver_is_genphy_1
+@@ -1658,20 +1658,22 @@ EXPORT_SYMBOL_GPL(phy_driver_is_genphy_1
  /**
   * phy_package_join - join a common PHY group
   * @phydev: target phy_device struct
@@ -151,7 +151,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
   *
   * This will set the shared pointer of the phydev to the shared storage.
   * If this is the first call for a this cookie the shared storage will be
-@@ -1673,17 +1675,17 @@ EXPORT_SYMBOL_GPL(phy_driver_is_genphy_1
+@@ -1681,17 +1683,17 @@ EXPORT_SYMBOL_GPL(phy_driver_is_genphy_1
   * Returns < 1 on error, 0 on success. Esp. calling phy_package_join()
   * with the same cookie but a different priv_size is an error.
   */
@@ -172,7 +172,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	if (!shared) {
  		ret = -ENOMEM;
  		shared = kzalloc(sizeof(*shared), GFP_KERNEL);
-@@ -1695,9 +1697,9 @@ int phy_package_join(struct phy_device *
+@@ -1703,9 +1705,9 @@ int phy_package_join(struct phy_device *
  				goto err_free;
  			shared->priv_size = priv_size;
  		}
@@ -184,7 +184,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	} else {
  		ret = -EINVAL;
  		if (priv_size && priv_size != shared->priv_size)
-@@ -1735,7 +1737,7 @@ void phy_package_leave(struct phy_device
+@@ -1743,7 +1745,7 @@ void phy_package_leave(struct phy_device
  		return;
  
  	if (refcount_dec_and_mutex_lock(&shared->refcnt, &bus->shared_lock)) {
@@ -193,7 +193,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		mutex_unlock(&bus->shared_lock);
  		kfree(shared->priv);
  		kfree(shared);
-@@ -1754,7 +1756,8 @@ static void devm_phy_package_leave(struc
+@@ -1762,7 +1764,8 @@ static void devm_phy_package_leave(struc
   * devm_phy_package_join - resource managed phy_package_join()
   * @dev: device that is registering this PHY package
   * @phydev: target phy_device struct
@@ -203,7 +203,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
   * @priv_size: if non-zero allocate this amount of bytes for private data
   *
   * Managed phy_package_join(). Shared storage fetched by this function,
-@@ -1762,7 +1765,7 @@ static void devm_phy_package_leave(struc
+@@ -1770,7 +1773,7 @@ static void devm_phy_package_leave(struc
   * phy_package_join() for more information.
   */
  int devm_phy_package_join(struct device *dev, struct phy_device *phydev,
@@ -212,7 +212,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  {
  	struct phy_device **ptr;
  	int ret;
-@@ -1772,7 +1775,7 @@ int devm_phy_package_join(struct device
+@@ -1780,7 +1783,7 @@ int devm_phy_package_join(struct device
  	if (!ptr)
  		return -ENOMEM;
  
diff --git a/lede/target/linux/generic/backport-6.6/716-v6.9-03-net-phy-add-devm-of_phy_package_join-helper.patch b/lede/target/linux/generic/backport-6.6/716-v6.9-03-net-phy-add-devm-of_phy_package_join-helper.patch
index f3e814b1a0..25f6c5ccda 100644
--- a/lede/target/linux/generic/backport-6.6/716-v6.9-03-net-phy-add-devm-of_phy_package_join-helper.patch
+++ b/lede/target/linux/generic/backport-6.6/716-v6.9-03-net-phy-add-devm-of_phy_package_join-helper.patch
@@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1698,6 +1698,7 @@ int phy_package_join(struct phy_device *
+@@ -1706,6 +1706,7 @@ int phy_package_join(struct phy_device *
  			shared->priv_size = priv_size;
  		}
  		shared->base_addr = base_addr;
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		refcount_set(&shared->refcnt, 1);
  		bus->shared[base_addr] = shared;
  	} else {
-@@ -1721,6 +1722,63 @@ err_unlock:
+@@ -1729,6 +1730,63 @@ err_unlock:
  EXPORT_SYMBOL_GPL(phy_package_join);
  
  /**
@@ -99,7 +99,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
   * phy_package_leave - leave a common PHY group
   * @phydev: target phy_device struct
   *
-@@ -1736,6 +1794,10 @@ void phy_package_leave(struct phy_device
+@@ -1744,6 +1802,10 @@ void phy_package_leave(struct phy_device
  	if (!shared)
  		return;
  
@@ -110,7 +110,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	if (refcount_dec_and_mutex_lock(&shared->refcnt, &bus->shared_lock)) {
  		bus->shared[shared->base_addr] = NULL;
  		mutex_unlock(&bus->shared_lock);
-@@ -1789,6 +1851,40 @@ int devm_phy_package_join(struct device
+@@ -1797,6 +1859,40 @@ int devm_phy_package_join(struct device
  EXPORT_SYMBOL_GPL(devm_phy_package_join);
  
  /**
diff --git a/lede/target/linux/generic/backport-6.6/716-v6.9-06-net-phy-provide-whether-link-has-changed-in-c37_read.patch b/lede/target/linux/generic/backport-6.6/716-v6.9-06-net-phy-provide-whether-link-has-changed-in-c37_read.patch
index 0441c8f60f..a96b9f1b66 100644
--- a/lede/target/linux/generic/backport-6.6/716-v6.9-06-net-phy-provide-whether-link-has-changed-in-c37_read.patch
+++ b/lede/target/linux/generic/backport-6.6/716-v6.9-06-net-phy-provide-whether-link-has-changed-in-c37_read.patch
@@ -41,7 +41,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -2607,12 +2607,15 @@ EXPORT_SYMBOL(genphy_read_status);
+@@ -2615,12 +2615,15 @@ EXPORT_SYMBOL(genphy_read_status);
  /**
   * genphy_c37_read_status - check the link status and update current link state
   * @phydev: target phy_device struct
@@ -58,7 +58,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  {
  	int lpa, err, old_link = phydev->link;
  
-@@ -2622,9 +2625,13 @@ int genphy_c37_read_status(struct phy_de
+@@ -2630,9 +2633,13 @@ int genphy_c37_read_status(struct phy_de
  		return err;
  
  	/* why bother the PHY if nothing can have changed */
diff --git a/lede/target/linux/generic/backport-6.6/835-v6.9-net-phy-add-support-for-PHY-LEDs-polarity-modes.patch b/lede/target/linux/generic/backport-6.6/835-v6.9-net-phy-add-support-for-PHY-LEDs-polarity-modes.patch
index 30390299c8..104f961c02 100644
--- a/lede/target/linux/generic/backport-6.6/835-v6.9-net-phy-add-support-for-PHY-LEDs-polarity-modes.patch
+++ b/lede/target/linux/generic/backport-6.6/835-v6.9-net-phy-add-support-for-PHY-LEDs-polarity-modes.patch
@@ -28,7 +28,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -3198,6 +3198,7 @@ static int of_phy_led(struct phy_device
+@@ -3201,6 +3201,7 @@ static int of_phy_led(struct phy_device
  	struct device *dev = &phydev->mdio.dev;
  	struct led_init_data init_data = {};
  	struct led_classdev *cdev;
@@ -36,7 +36,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  	struct phy_led *phyled;
  	u32 index;
  	int err;
-@@ -3215,6 +3216,21 @@ static int of_phy_led(struct phy_device
+@@ -3218,6 +3219,21 @@ static int of_phy_led(struct phy_device
  	if (index > U8_MAX)
  		return -EINVAL;
  
diff --git a/lede/target/linux/generic/backport-6.6/850-v6.8-bus-mhi-host-Add-a-separate-timeout-parameter-for-wa.patch b/lede/target/linux/generic/backport-6.6/850-v6.8-bus-mhi-host-Add-a-separate-timeout-parameter-for-wa.patch
index 23f20ed65e..94d9bcd93d 100644
--- a/lede/target/linux/generic/backport-6.6/850-v6.8-bus-mhi-host-Add-a-separate-timeout-parameter-for-wa.patch
+++ b/lede/target/linux/generic/backport-6.6/850-v6.8-bus-mhi-host-Add-a-separate-timeout-parameter-for-wa.patch
@@ -23,7 +23,7 @@ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 
 --- a/drivers/bus/mhi/host/init.c
 +++ b/drivers/bus/mhi/host/init.c
-@@ -881,6 +881,7 @@ static int parse_config(struct mhi_contr
+@@ -882,6 +882,7 @@ static int parse_config(struct mhi_contr
  	if (!mhi_cntrl->timeout_ms)
  		mhi_cntrl->timeout_ms = MHI_TIMEOUT_MS;
  
@@ -33,7 +33,7 @@ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  	if (!mhi_cntrl->buffer_len)
 --- a/drivers/bus/mhi/host/internal.h
 +++ b/drivers/bus/mhi/host/internal.h
-@@ -321,7 +321,7 @@ int __must_check mhi_read_reg_field(stru
+@@ -324,7 +324,7 @@ int __must_check mhi_read_reg_field(stru
  				    u32 *out);
  int __must_check mhi_poll_reg_field(struct mhi_controller *mhi_cntrl,
  				    void __iomem *base, u32 offset, u32 mask,
@@ -60,7 +60,7 @@ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  		ret = mhi_read_reg_field(mhi_cntrl, base, offset, mask, &out);
 --- a/drivers/bus/mhi/host/pm.c
 +++ b/drivers/bus/mhi/host/pm.c
-@@ -163,6 +163,7 @@ int mhi_ready_state_transition(struct mh
+@@ -171,6 +171,7 @@ int mhi_ready_state_transition(struct mh
  	enum mhi_pm_state cur_state;
  	struct device *dev = &mhi_cntrl->mhi_dev->dev;
  	u32 interval_us = 25000; /* poll register field every 25 milliseconds */
@@ -68,7 +68,7 @@ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  	int ret, i;
  
  	/* Check if device entered error state */
-@@ -173,14 +174,18 @@ int mhi_ready_state_transition(struct mh
+@@ -181,14 +182,18 @@ int mhi_ready_state_transition(struct mh
  
  	/* Wait for RESET to be cleared and READY bit to be set by the device */
  	ret = mhi_poll_reg_field(mhi_cntrl, mhi_cntrl->regs, MHICTRL,
@@ -89,7 +89,7 @@ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  	if (ret) {
  		dev_err(dev, "Device failed to enter MHI Ready\n");
  		return ret;
-@@ -479,7 +484,7 @@ static void mhi_pm_disable_transition(st
+@@ -487,7 +492,7 @@ static void mhi_pm_disable_transition(st
  
  		/* Wait for the reset bit to be cleared by the device */
  		ret = mhi_poll_reg_field(mhi_cntrl, mhi_cntrl->regs, MHICTRL,
@@ -98,7 +98,7 @@ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  		if (ret)
  			dev_err(dev, "Device failed to clear MHI Reset\n");
  
-@@ -492,8 +497,8 @@ static void mhi_pm_disable_transition(st
+@@ -500,8 +505,8 @@ static void mhi_pm_disable_transition(st
  		if (!MHI_IN_PBL(mhi_get_exec_env(mhi_cntrl))) {
  			/* wait for ready to be set */
  			ret = mhi_poll_reg_field(mhi_cntrl, mhi_cntrl->regs,
@@ -109,7 +109,7 @@ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  			if (ret)
  				dev_err(dev, "Device failed to enter READY state\n");
  		}
-@@ -1111,7 +1116,8 @@ int mhi_async_power_up(struct mhi_contro
+@@ -1125,7 +1130,8 @@ int mhi_async_power_up(struct mhi_contro
  	if (state == MHI_STATE_SYS_ERR) {
  		mhi_set_mhi_state(mhi_cntrl, MHI_STATE_RESET);
  		ret = mhi_poll_reg_field(mhi_cntrl, mhi_cntrl->regs, MHICTRL,
@@ -119,7 +119,7 @@ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  		if (ret) {
  			dev_info(dev, "Failed to reset MHI due to syserr state\n");
  			goto error_exit;
-@@ -1202,14 +1208,18 @@ EXPORT_SYMBOL_GPL(mhi_power_down);
+@@ -1216,14 +1222,18 @@ EXPORT_SYMBOL_GPL(mhi_power_down);
  int mhi_sync_power_up(struct mhi_controller *mhi_cntrl)
  {
  	int ret = mhi_async_power_up(mhi_cntrl);
diff --git a/lede/target/linux/generic/config-6.6 b/lede/target/linux/generic/config-6.6
index d9405b091d..268fbd2c23 100644
--- a/lede/target/linux/generic/config-6.6
+++ b/lede/target/linux/generic/config-6.6
@@ -7300,8 +7300,8 @@ CONFIG_USB_BELKIN=y
 # CONFIG_USB_CDNS3 is not set
 # CONFIG_USB_CDNS3_IMX is not set
 # CONFIG_USB_CDNS3_PCI_WRAP is not set
-# CONFIG_USB_CDNS_SUPPORT is not set
 # CONFIG_USB_CDNSP_PCI is not set
+# CONFIG_USB_CDNS_SUPPORT is not set
 # CONFIG_USB_CHAOSKEY is not set
 # CONFIG_USB_CHIPIDEA is not set
 # CONFIG_USB_CHIPIDEA_GENERIC is not set
diff --git a/lede/target/linux/generic/hack-6.6/204-module_strip.patch b/lede/target/linux/generic/hack-6.6/204-module_strip.patch
index c4e864c873..8619c29073 100644
--- a/lede/target/linux/generic/hack-6.6/204-module_strip.patch
+++ b/lede/target/linux/generic/hack-6.6/204-module_strip.patch
@@ -141,7 +141,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (err)
 --- a/scripts/mod/modpost.c
 +++ b/scripts/mod/modpost.c
-@@ -1690,7 +1690,9 @@ static void read_symbols(const char *mod
+@@ -1692,7 +1692,9 @@ static void read_symbols(const char *mod
  		symname = remove_dot(info.strtab + sym->st_name);
  
  		handle_symbol(mod, &info, sym, symname);
@@ -151,7 +151,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	}
  
  	check_sec_ref(mod, &info);
-@@ -1863,8 +1865,10 @@ static void add_header(struct buffer *b,
+@@ -1865,8 +1867,10 @@ static void add_header(struct buffer *b,
  	buf_printf(b, "BUILD_SALT;\n");
  	buf_printf(b, "BUILD_LTO_INFO;\n");
  	buf_printf(b, "\n");
@@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	buf_printf(b, "\n");
  	buf_printf(b, "__visible struct module __this_module\n");
  	buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n");
-@@ -1878,8 +1882,10 @@ static void add_header(struct buffer *b,
+@@ -1880,8 +1884,10 @@ static void add_header(struct buffer *b,
  	buf_printf(b, "\t.arch = MODULE_ARCH_INIT,\n");
  	buf_printf(b, "};\n");
  
@@ -173,7 +173,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  	buf_printf(b,
  		   "\n"
-@@ -1887,8 +1893,10 @@ static void add_header(struct buffer *b,
+@@ -1889,8 +1895,10 @@ static void add_header(struct buffer *b,
  		   "MODULE_INFO(retpoline, \"Y\");\n"
  		   "#endif\n");
  
@@ -184,7 +184,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  	if (strstarts(mod->name, "tools/testing"))
  		buf_printf(b, "\nMODULE_INFO(test, \"Y\");\n");
-@@ -1998,11 +2006,13 @@ static void add_depends(struct buffer *b
+@@ -2000,11 +2008,13 @@ static void add_depends(struct buffer *b
  
  static void add_srcversion(struct buffer *b, struct module *mod)
  {
@@ -198,7 +198,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  }
  
  static void write_buf(struct buffer *b, const char *fname)
-@@ -2085,7 +2095,9 @@ static void write_mod_c_file(struct modu
+@@ -2087,7 +2097,9 @@ static void write_mod_c_file(struct modu
  	add_exported_symbols(&buf, mod);
  	add_versions(&buf, mod);
  	add_depends(&buf, mod);
diff --git a/lede/target/linux/generic/hack-6.6/721-net-add-packet-mangeling.patch b/lede/target/linux/generic/hack-6.6/721-net-add-packet-mangeling.patch
index 96e77ea9db..8ef5faa3b1 100644
--- a/lede/target/linux/generic/hack-6.6/721-net-add-packet-mangeling.patch
+++ b/lede/target/linux/generic/hack-6.6/721-net-add-packet-mangeling.patch
@@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
   */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -3070,6 +3070,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -3081,6 +3081,10 @@ static inline int pskb_trim(struct sk_bu
  	return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
  
@@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  /**
   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *	@skb: buffer to alter
-@@ -3235,16 +3239,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -3246,16 +3250,6 @@ static inline struct sk_buff *dev_alloc_
  }
  
  
diff --git a/lede/target/linux/generic/hack-6.6/930-usb-net-for-fm350.patch b/lede/target/linux/generic/hack-6.6/930-usb-net-for-fm350.patch
index bf436eb2e7..fa4f4044ef 100644
--- a/lede/target/linux/generic/hack-6.6/930-usb-net-for-fm350.patch
+++ b/lede/target/linux/generic/hack-6.6/930-usb-net-for-fm350.patch
@@ -1,6 +1,6 @@
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -589,6 +589,7 @@
+@@ -642,6 +642,7 @@ static void option_instat_callback(struc
  
  
  static const struct usb_device_id option_ids[] = {
@@ -8,7 +8,7 @@
  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
-@@ -2210,6 +2211,15 @@
+@@ -2379,6 +2380,15 @@ static int option_probe(struct usb_seria
  	if (device_flags & NUMEP2 && iface_desc->bNumEndpoints != 2)
  		return -ENODEV;
  
diff --git a/lede/target/linux/generic/pending-6.6/655-increase_skb_pad.patch b/lede/target/linux/generic/pending-6.6/655-increase_skb_pad.patch
index 1cdf81afa4..31a40f1cdf 100644
--- a/lede/target/linux/generic/pending-6.6/655-increase_skb_pad.patch
+++ b/lede/target/linux/generic/pending-6.6/655-increase_skb_pad.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -3036,7 +3036,7 @@ static inline int pskb_network_may_pull(
+@@ -3047,7 +3047,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD
diff --git a/lede/target/linux/generic/pending-6.6/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/lede/target/linux/generic/pending-6.6/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 06126d65d3..0d65fa7272 100644
--- a/lede/target/linux/generic/pending-6.6/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/lede/target/linux/generic/pending-6.6/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -361,7 +361,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  	memcpy(p->name, u->name, sizeof(u->name));
  }
  
-@@ -1963,6 +2133,15 @@ static int ip6_tnl_validate(struct nlatt
+@@ -1964,6 +2134,15 @@ static int ip6_tnl_validate(struct nlatt
  	return 0;
  }
  
@@ -377,7 +377,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  static void ip6_tnl_netlink_parms(struct nlattr *data[],
  				  struct __ip6_tnl_parm *parms)
  {
-@@ -2000,6 +2179,46 @@ static void ip6_tnl_netlink_parms(struct
+@@ -2001,6 +2180,46 @@ static void ip6_tnl_netlink_parms(struct
  
  	if (data[IFLA_IPTUN_FWMARK])
  		parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
@@ -424,7 +424,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  }
  
  static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
-@@ -2083,6 +2302,12 @@ static void ip6_tnl_dellink(struct net_d
+@@ -2084,6 +2303,12 @@ static void ip6_tnl_dellink(struct net_d
  
  static size_t ip6_tnl_get_size(const struct net_device *dev)
  {
@@ -437,7 +437,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  	return
  		/* IFLA_IPTUN_LINK */
  		nla_total_size(4) +
-@@ -2112,6 +2337,24 @@ static size_t ip6_tnl_get_size(const str
+@@ -2113,6 +2338,24 @@ static size_t ip6_tnl_get_size(const str
  		nla_total_size(0) +
  		/* IFLA_IPTUN_FWMARK */
  		nla_total_size(4) +
@@ -462,7 +462,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  		0;
  }
  
-@@ -2119,6 +2362,9 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -2120,6 +2363,9 @@ static int ip6_tnl_fill_info(struct sk_b
  {
  	struct ip6_tnl *tunnel = netdev_priv(dev);
  	struct __ip6_tnl_parm *parm = &tunnel->parms;
@@ -472,7 +472,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  
  	if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
  	    nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
-@@ -2128,9 +2374,27 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -2129,9 +2375,27 @@ static int ip6_tnl_fill_info(struct sk_b
  	    nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
  	    nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
  	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
@@ -501,7 +501,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  	if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
  	    nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
  	    nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
-@@ -2170,6 +2434,7 @@ static const struct nla_policy ip6_tnl_p
+@@ -2171,6 +2435,7 @@ static const struct nla_policy ip6_tnl_p
  	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },
  	[IFLA_IPTUN_COLLECT_METADATA]	= { .type = NLA_FLAG },
  	[IFLA_IPTUN_FWMARK]		= { .type = NLA_U32 },
diff --git a/lede/target/linux/generic/pending-6.6/703-phy-add-detach-callback-to-struct-phy_driver.patch b/lede/target/linux/generic/pending-6.6/703-phy-add-detach-callback-to-struct-phy_driver.patch
index 5166dd2115..c544a06dfc 100644
--- a/lede/target/linux/generic/pending-6.6/703-phy-add-detach-callback-to-struct-phy_driver.patch
+++ b/lede/target/linux/generic/pending-6.6/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1900,6 +1900,9 @@ void phy_detach(struct phy_device *phyde
+@@ -1908,6 +1908,9 @@ void phy_detach(struct phy_device *phyde
  	if (phydev->devlink)
  		device_link_del(phydev->devlink);
  
diff --git a/lede/target/linux/mediatek/files-5.15/drivers/pinctrl/mediatek/pinctrl-mt7988.c b/lede/target/linux/mediatek/files-5.15/drivers/pinctrl/mediatek/pinctrl-mt7988.c
index 80a7e19f7a..659c83e997 100644
--- a/lede/target/linux/mediatek/files-5.15/drivers/pinctrl/mediatek/pinctrl-mt7988.c
+++ b/lede/target/linux/mediatek/files-5.15/drivers/pinctrl/mediatek/pinctrl-mt7988.c
@@ -46,37 +46,53 @@ static const struct mtk_pin_field_calc mt7988_pin_do_range[] = {
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_ies_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0x30, 0x10, 13, 1),
-	PIN_FIELD_BASE(2, 3, 5, 0x30, 0x10, 11, 1),
+	PIN_FIELD_BASE(0, 0, 5, 0x30, 0x10, 13, 1),
+	PIN_FIELD_BASE(1, 1, 5, 0x30, 0x10, 14, 1),
+	PIN_FIELD_BASE(2, 2, 5, 0x30, 0x10, 11, 1),
+	PIN_FIELD_BASE(3, 3, 5, 0x30, 0x10, 12, 1),
 	PIN_FIELD_BASE(4, 4, 5, 0x30, 0x10, 0, 1),
-	PIN_FIELD_BASE(5, 6, 5, 0x30, 0x10, 9, 1),
+	PIN_FIELD_BASE(5, 5, 5, 0x30, 0x10, 9, 1),
+	PIN_FIELD_BASE(6, 6, 5, 0x30, 0x10, 10, 1),
+
 	PIN_FIELD_BASE(7, 7, 4, 0x30, 0x10, 8, 1),
 	PIN_FIELD_BASE(8, 8, 4, 0x30, 0x10, 6, 1),
 	PIN_FIELD_BASE(9, 9, 4, 0x30, 0x10, 5, 1),
 	PIN_FIELD_BASE(10, 10, 4, 0x30, 0x10, 3, 1),
+
 	PIN_FIELD_BASE(11, 11, 1, 0x40, 0x10, 0, 1),
 	PIN_FIELD_BASE(12, 12, 1, 0x40, 0x10, 21, 1),
-	PIN_FIELD_BASE(13, 14, 1, 0x40, 0x10, 1, 1),
-	PIN_FIELD_BASE(15, 16, 5, 0x30, 0x10, 7, 1),
-	PIN_FIELD_BASE(17, 18, 5, 0x30, 0x10, 3, 1),
+	PIN_FIELD_BASE(13, 13, 1, 0x40, 0x10, 1, 1),
+	PIN_FIELD_BASE(14, 14, 1, 0x40, 0x10, 2, 1),
+
+	PIN_FIELD_BASE(15, 15, 5, 0x30, 0x10, 7, 1),
+	PIN_FIELD_BASE(16, 16, 5, 0x30, 0x10, 8, 1),
+	PIN_FIELD_BASE(17, 17, 5, 0x30, 0x10, 3, 1),
+	PIN_FIELD_BASE(18, 18, 5, 0x30, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(19, 19, 4, 0x30, 0x10, 7, 1),
 	PIN_FIELD_BASE(20, 20, 4, 0x30, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(21, 21, 3, 0x50, 0x10, 17, 1),
 	PIN_FIELD_BASE(22, 22, 3, 0x50, 0x10, 23, 1),
 	PIN_FIELD_BASE(23, 23, 3, 0x50, 0x10, 20, 1),
 	PIN_FIELD_BASE(24, 24, 3, 0x50, 0x10, 19, 1),
-	PIN_FIELD_BASE(25, 26, 3, 0x50, 0x10, 21, 1),
+	PIN_FIELD_BASE(25, 25, 3, 0x50, 0x10, 21, 1),
+	PIN_FIELD_BASE(26, 26, 3, 0x50, 0x10, 22, 1),
 	PIN_FIELD_BASE(27, 27, 3, 0x50, 0x10, 18, 1),
-	PIN_FIELD_BASE(28, 30, 3, 0x50, 0x10, 25, 1),
+	PIN_FIELD_BASE(28, 28, 3, 0x50, 0x10, 25, 1),
+	PIN_FIELD_BASE(29, 29, 3, 0x50, 0x10, 26, 1),
+	PIN_FIELD_BASE(30, 30, 3, 0x50, 0x10, 27, 1),
 	PIN_FIELD_BASE(31, 31, 3, 0x50, 0x10, 24, 1),
 	PIN_FIELD_BASE(32, 32, 3, 0x50, 0x10, 28, 1),
 	PIN_FIELD_BASE(33, 33, 3, 0x60, 0x10, 0, 1),
 	PIN_FIELD_BASE(34, 34, 3, 0x50, 0x10, 31, 1),
-	PIN_FIELD_BASE(35, 36, 3, 0x50, 0x10, 29, 1),
+	PIN_FIELD_BASE(35, 35, 3, 0x50, 0x10, 29, 1),
+	PIN_FIELD_BASE(36, 36, 3, 0x50, 0x10, 30, 1),
 	PIN_FIELD_BASE(37, 37, 3, 0x60, 0x10, 1, 1),
 	PIN_FIELD_BASE(38, 38, 3, 0x50, 0x10, 11, 1),
 	PIN_FIELD_BASE(39, 39, 3, 0x50, 0x10, 10, 1),
-	PIN_FIELD_BASE(40, 41, 3, 0x50, 0x10, 0, 1),
+	PIN_FIELD_BASE(40, 40, 3, 0x50, 0x10, 0, 1),
+	PIN_FIELD_BASE(41, 41, 3, 0x50, 0x10, 1, 1),
 	PIN_FIELD_BASE(42, 42, 3, 0x50, 0x10, 9, 1),
 	PIN_FIELD_BASE(43, 43, 3, 0x50, 0x10, 8, 1),
 	PIN_FIELD_BASE(44, 44, 3, 0x50, 0x10, 7, 1),
@@ -86,17 +102,31 @@ static const struct mtk_pin_field_calc mt7988_pin_ies_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0x50, 0x10, 3, 1),
 	PIN_FIELD_BASE(49, 49, 3, 0x50, 0x10, 2, 1),
 	PIN_FIELD_BASE(50, 50, 3, 0x50, 0x10, 15, 1),
-	PIN_FIELD_BASE(51, 53, 3, 0x50, 0x10, 12, 1),
+	PIN_FIELD_BASE(51, 51, 3, 0x50, 0x10, 12, 1),
+	PIN_FIELD_BASE(52, 52, 3, 0x50, 0x10, 13, 1),
+	PIN_FIELD_BASE(53, 53, 3, 0x50, 0x10, 14, 1),
 	PIN_FIELD_BASE(54, 54, 3, 0x50, 0x10, 16, 1),
-	PIN_FIELD_BASE(55, 56, 1, 0x40, 0x10, 14, 1),
+
+	PIN_FIELD_BASE(55, 55, 1, 0x40, 0x10, 14, 1),
+	PIN_FIELD_BASE(56, 56, 1, 0x40, 0x10, 15, 1),
 	PIN_FIELD_BASE(57, 57, 1, 0x40, 0x10, 13, 1),
-	PIN_FIELD_BASE(58, 60, 1, 0x40, 0x10, 4, 1),
+	PIN_FIELD_BASE(58, 58, 1, 0x40, 0x10, 4, 1),
+	PIN_FIELD_BASE(59, 59, 1, 0x40, 0x10, 5, 1),
+	PIN_FIELD_BASE(60, 60, 1, 0x40, 0x10, 6, 1),
 	PIN_FIELD_BASE(61, 61, 1, 0x40, 0x10, 3, 1),
 	PIN_FIELD_BASE(62, 62, 1, 0x40, 0x10, 7, 1),
 	PIN_FIELD_BASE(63, 63, 1, 0x40, 0x10, 20, 1),
-	PIN_FIELD_BASE(64, 68, 1, 0x40, 0x10, 8, 1),
-	PIN_FIELD_BASE(69, 70, 5, 0x30, 0x10, 1, 1),
-	PIN_FIELD_BASE(71, 72, 5, 0x30, 0x10, 5, 1),
+	PIN_FIELD_BASE(64, 64, 1, 0x40, 0x10, 8, 1),
+	PIN_FIELD_BASE(65, 65, 1, 0x40, 0x10, 9, 1),
+	PIN_FIELD_BASE(66, 66, 1, 0x40, 0x10, 10, 1),
+	PIN_FIELD_BASE(67, 67, 1, 0x40, 0x10, 11, 1),
+	PIN_FIELD_BASE(68, 68, 1, 0x40, 0x10, 12, 1),
+
+	PIN_FIELD_BASE(69, 69, 5, 0x30, 0x10, 1, 1),
+	PIN_FIELD_BASE(70, 70, 5, 0x30, 0x10, 2, 1),
+	PIN_FIELD_BASE(71, 71, 5, 0x30, 0x10, 5, 1),
+	PIN_FIELD_BASE(72, 72, 5, 0x30, 0x10, 6, 1),
+
 	PIN_FIELD_BASE(73, 73, 4, 0x30, 0x10, 10, 1),
 	PIN_FIELD_BASE(74, 74, 4, 0x30, 0x10, 1, 1),
 	PIN_FIELD_BASE(75, 75, 4, 0x30, 0x10, 11, 1),
@@ -104,42 +134,61 @@ static const struct mtk_pin_field_calc mt7988_pin_ies_range[] = {
 	PIN_FIELD_BASE(77, 77, 4, 0x30, 0x10, 2, 1),
 	PIN_FIELD_BASE(78, 78, 4, 0x30, 0x10, 0, 1),
 	PIN_FIELD_BASE(79, 79, 4, 0x30, 0x10, 12, 1),
-	PIN_FIELD_BASE(80, 81, 1, 0x40, 0x10, 18, 1),
-	PIN_FIELD_BASE(82, 83, 1, 0x40, 0x10, 16, 1),
+
+	PIN_FIELD_BASE(80, 80, 1, 0x40, 0x10, 18, 1),
+	PIN_FIELD_BASE(81, 81, 1, 0x40, 0x10, 19, 1),
+	PIN_FIELD_BASE(82, 82, 1, 0x40, 0x10, 16, 1),
+	PIN_FIELD_BASE(83, 83, 1, 0x40, 0x10, 17, 1),
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_smt_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0xc0, 0x10, 13, 1),
-	PIN_FIELD_BASE(2, 3, 5, 0xc0, 0x10, 11, 1),
+	PIN_FIELD_BASE(0, 0, 5, 0xc0, 0x10, 13, 1),
+	PIN_FIELD_BASE(1, 1, 5, 0xc0, 0x10, 14, 1),
+	PIN_FIELD_BASE(2, 2, 5, 0xc0, 0x10, 11, 1),
+	PIN_FIELD_BASE(3, 3, 5, 0xc0, 0x10, 12, 1),
 	PIN_FIELD_BASE(4, 4, 5, 0xc0, 0x10, 0, 1),
-	PIN_FIELD_BASE(5, 6, 5, 0xc0, 0x10, 9, 1),
+	PIN_FIELD_BASE(5, 5, 5, 0xc0, 0x10, 9, 1),
+	PIN_FIELD_BASE(6, 6, 5, 0xc0, 0x10, 10, 1),
+
 	PIN_FIELD_BASE(7, 7, 4, 0xb0, 0x10, 8, 1),
 	PIN_FIELD_BASE(8, 8, 4, 0xb0, 0x10, 6, 1),
 	PIN_FIELD_BASE(9, 9, 4, 0xb0, 0x10, 5, 1),
 	PIN_FIELD_BASE(10, 10, 4, 0xb0, 0x10, 3, 1),
+
 	PIN_FIELD_BASE(11, 11, 1, 0xe0, 0x10, 0, 1),
 	PIN_FIELD_BASE(12, 12, 1, 0xe0, 0x10, 21, 1),
-	PIN_FIELD_BASE(13, 14, 1, 0xe0, 0x10, 1, 1),
-	PIN_FIELD_BASE(15, 16, 5, 0xc0, 0x10, 7, 1),
-	PIN_FIELD_BASE(17, 18, 5, 0xc0, 0x10, 3, 1),
+	PIN_FIELD_BASE(13, 13, 1, 0xe0, 0x10, 1, 1),
+	PIN_FIELD_BASE(14, 14, 1, 0xe0, 0x10, 2, 1),
+
+	PIN_FIELD_BASE(15, 15, 5, 0xc0, 0x10, 7, 1),
+	PIN_FIELD_BASE(16, 16, 5, 0xc0, 0x10, 8, 1),
+	PIN_FIELD_BASE(17, 17, 5, 0xc0, 0x10, 3, 1),
+	PIN_FIELD_BASE(18, 18, 5, 0xc0, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(19, 19, 4, 0xb0, 0x10, 7, 1),
 	PIN_FIELD_BASE(20, 20, 4, 0xb0, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(21, 21, 3, 0x140, 0x10, 17, 1),
 	PIN_FIELD_BASE(22, 22, 3, 0x140, 0x10, 23, 1),
 	PIN_FIELD_BASE(23, 23, 3, 0x140, 0x10, 20, 1),
 	PIN_FIELD_BASE(24, 24, 3, 0x140, 0x10, 19, 1),
-	PIN_FIELD_BASE(25, 26, 3, 0x140, 0x10, 21, 1),
+	PIN_FIELD_BASE(25, 25, 3, 0x140, 0x10, 21, 1),
+	PIN_FIELD_BASE(26, 26, 3, 0x140, 0x10, 22, 1),
 	PIN_FIELD_BASE(27, 27, 3, 0x140, 0x10, 18, 1),
-	PIN_FIELD_BASE(28, 30, 3, 0x140, 0x10, 25, 1),
+	PIN_FIELD_BASE(28, 28, 3, 0x140, 0x10, 25, 1),
+	PIN_FIELD_BASE(29, 29, 3, 0x140, 0x10, 26, 1),
+	PIN_FIELD_BASE(30, 30, 3, 0x140, 0x10, 27, 1),
 	PIN_FIELD_BASE(31, 31, 3, 0x140, 0x10, 24, 1),
 	PIN_FIELD_BASE(32, 32, 3, 0x140, 0x10, 28, 1),
 	PIN_FIELD_BASE(33, 33, 3, 0x150, 0x10, 0, 1),
 	PIN_FIELD_BASE(34, 34, 3, 0x140, 0x10, 31, 1),
-	PIN_FIELD_BASE(35, 36, 3, 0x140, 0x10, 29, 1),
+	PIN_FIELD_BASE(35, 35, 3, 0x140, 0x10, 29, 1),
+	PIN_FIELD_BASE(36, 36, 3, 0x140, 0x10, 30, 1),
 	PIN_FIELD_BASE(37, 37, 3, 0x150, 0x10, 1, 1),
 	PIN_FIELD_BASE(38, 38, 3, 0x140, 0x10, 11, 1),
 	PIN_FIELD_BASE(39, 39, 3, 0x140, 0x10, 10, 1),
-	PIN_FIELD_BASE(40, 41, 3, 0x140, 0x10, 0, 1),
+	PIN_FIELD_BASE(40, 40, 3, 0x140, 0x10, 0, 1),
+	PIN_FIELD_BASE(41, 41, 3, 0x140, 0x10, 1, 1),
 	PIN_FIELD_BASE(42, 42, 3, 0x140, 0x10, 9, 1),
 	PIN_FIELD_BASE(43, 43, 3, 0x140, 0x10, 8, 1),
 	PIN_FIELD_BASE(44, 44, 3, 0x140, 0x10, 7, 1),
@@ -149,17 +198,31 @@ static const struct mtk_pin_field_calc mt7988_pin_smt_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0x140, 0x10, 3, 1),
 	PIN_FIELD_BASE(49, 49, 3, 0x140, 0x10, 2, 1),
 	PIN_FIELD_BASE(50, 50, 3, 0x140, 0x10, 15, 1),
-	PIN_FIELD_BASE(51, 53, 3, 0x140, 0x10, 12, 1),
+	PIN_FIELD_BASE(51, 51, 3, 0x140, 0x10, 12, 1),
+	PIN_FIELD_BASE(52, 52, 3, 0x140, 0x10, 13, 1),
+	PIN_FIELD_BASE(53, 53, 3, 0x140, 0x10, 14, 1),
 	PIN_FIELD_BASE(54, 54, 3, 0x140, 0x10, 16, 1),
-	PIN_FIELD_BASE(55, 56, 1, 0xe0, 0x10, 14, 1),
+
+	PIN_FIELD_BASE(55, 55, 1, 0xe0, 0x10, 14, 1),
+	PIN_FIELD_BASE(56, 56, 1, 0xe0, 0x10, 15, 1),
 	PIN_FIELD_BASE(57, 57, 1, 0xe0, 0x10, 13, 1),
-	PIN_FIELD_BASE(58, 60, 1, 0xe0, 0x10, 4, 1),
+	PIN_FIELD_BASE(58, 58, 1, 0xe0, 0x10, 4, 1),
+	PIN_FIELD_BASE(59, 59, 1, 0xe0, 0x10, 5, 1),
+	PIN_FIELD_BASE(60, 60, 1, 0xe0, 0x10, 6, 1),
 	PIN_FIELD_BASE(61, 61, 1, 0xe0, 0x10, 3, 1),
 	PIN_FIELD_BASE(62, 62, 1, 0xe0, 0x10, 7, 1),
 	PIN_FIELD_BASE(63, 63, 1, 0xe0, 0x10, 20, 1),
-	PIN_FIELD_BASE(64, 68, 1, 0xe0, 0x10, 8, 1),
-	PIN_FIELD_BASE(69, 70, 5, 0xc0, 0x10, 1, 1),
-	PIN_FIELD_BASE(71, 72, 5, 0xc0, 0x10, 5, 1),
+	PIN_FIELD_BASE(64, 64, 1, 0xe0, 0x10, 8, 1),
+	PIN_FIELD_BASE(65, 65, 1, 0xe0, 0x10, 9, 1),
+	PIN_FIELD_BASE(66, 66, 1, 0xe0, 0x10, 10, 1),
+	PIN_FIELD_BASE(67, 67, 1, 0xe0, 0x10, 11, 1),
+	PIN_FIELD_BASE(68, 68, 1, 0xe0, 0x10, 12, 1),
+
+	PIN_FIELD_BASE(69, 69, 5, 0xc0, 0x10, 1, 1),
+	PIN_FIELD_BASE(70, 70, 5, 0xc0, 0x10, 2, 1),
+	PIN_FIELD_BASE(71, 71, 5, 0xc0, 0x10, 5, 1),
+	PIN_FIELD_BASE(72, 72, 5, 0xc0, 0x10, 6, 1),
+
 	PIN_FIELD_BASE(73, 73, 4, 0xb0, 0x10, 10, 1),
 	PIN_FIELD_BASE(74, 74, 4, 0xb0, 0x10, 1, 1),
 	PIN_FIELD_BASE(75, 75, 4, 0xb0, 0x10, 11, 1),
@@ -167,8 +230,11 @@ static const struct mtk_pin_field_calc mt7988_pin_smt_range[] = {
 	PIN_FIELD_BASE(77, 77, 4, 0xb0, 0x10, 2, 1),
 	PIN_FIELD_BASE(78, 78, 4, 0xb0, 0x10, 0, 1),
 	PIN_FIELD_BASE(79, 79, 4, 0xb0, 0x10, 12, 1),
-	PIN_FIELD_BASE(80, 81, 1, 0xe0, 0x10, 18, 1),
-	PIN_FIELD_BASE(82, 83, 1, 0xe0, 0x10, 16, 1),
+
+	PIN_FIELD_BASE(80, 80, 1, 0xe0, 0x10, 18, 1),
+	PIN_FIELD_BASE(81, 81, 1, 0xe0, 0x10, 19, 1),
+	PIN_FIELD_BASE(82, 82, 1, 0xe0, 0x10, 16, 1),
+	PIN_FIELD_BASE(83, 83, 1, 0xe0, 0x10, 17, 1),
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_pu_range[] = {
@@ -176,8 +242,11 @@ static const struct mtk_pin_field_calc mt7988_pin_pu_range[] = {
 	PIN_FIELD_BASE(8, 8, 4, 0x60, 0x10, 4, 1),
 	PIN_FIELD_BASE(9, 9, 4, 0x60, 0x10, 3, 1),
 	PIN_FIELD_BASE(10, 10, 4, 0x60, 0x10, 2, 1),
-	PIN_FIELD_BASE(13, 14, 1, 0x70, 0x10, 0, 1),
+
+	PIN_FIELD_BASE(13, 13, 1, 0x70, 0x10, 0, 1),
+	PIN_FIELD_BASE(14, 14, 1, 0x70, 0x10, 1, 1),
 	PIN_FIELD_BASE(63, 63, 1, 0x70, 0x10, 2, 1),
+
 	PIN_FIELD_BASE(75, 75, 4, 0x60, 0x10, 7, 1),
 	PIN_FIELD_BASE(76, 76, 4, 0x60, 0x10, 6, 1),
 	PIN_FIELD_BASE(77, 77, 4, 0x60, 0x10, 1, 1),
@@ -190,11 +259,19 @@ static const struct mtk_pin_field_calc mt7988_pin_pd_range[] = {
 	PIN_FIELD_BASE(8, 8, 4, 0x40, 0x10, 4, 1),
 	PIN_FIELD_BASE(9, 9, 4, 0x40, 0x10, 3, 1),
 	PIN_FIELD_BASE(10, 10, 4, 0x40, 0x10, 2, 1),
-	PIN_FIELD_BASE(13, 14, 1, 0x50, 0x10, 0, 1),
-	PIN_FIELD_BASE(15, 16, 5, 0x40, 0x10, 4, 1),
-	PIN_FIELD_BASE(17, 18, 5, 0x40, 0x10, 0, 1),
+
+	PIN_FIELD_BASE(13, 13, 1, 0x50, 0x10, 0, 1),
+	PIN_FIELD_BASE(14, 14, 1, 0x50, 0x10, 1, 1),
+
+	PIN_FIELD_BASE(15, 15, 5, 0x40, 0x10, 4, 1),
+	PIN_FIELD_BASE(16, 16, 5, 0x40, 0x10, 5, 1),
+	PIN_FIELD_BASE(17, 17, 5, 0x40, 0x10, 0, 1),
+	PIN_FIELD_BASE(18, 18, 5, 0x40, 0x10, 1, 1),
+
 	PIN_FIELD_BASE(63, 63, 1, 0x50, 0x10, 2, 1),
-	PIN_FIELD_BASE(71, 72, 5, 0x40, 0x10, 2, 1),
+	PIN_FIELD_BASE(71, 71, 5, 0x40, 0x10, 2, 1),
+	PIN_FIELD_BASE(72, 72, 5, 0x40, 0x10, 3, 1),
+
 	PIN_FIELD_BASE(75, 75, 4, 0x40, 0x10, 7, 1),
 	PIN_FIELD_BASE(76, 76, 4, 0x40, 0x10, 6, 1),
 	PIN_FIELD_BASE(77, 77, 4, 0x40, 0x10, 1, 1),
@@ -203,26 +280,37 @@ static const struct mtk_pin_field_calc mt7988_pin_pd_range[] = {
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_drv_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0x00, 0x10, 21, 3),
-	PIN_FIELD_BASE(2, 3, 5, 0x00, 0x10, 15, 3),
+	PIN_FIELD_BASE(0, 0, 5, 0x00, 0x10, 21, 3),
+	PIN_FIELD_BASE(1, 1, 5, 0x00, 0x10, 24, 3),
+	PIN_FIELD_BASE(2, 2, 5, 0x00, 0x10, 15, 3),
+	PIN_FIELD_BASE(3, 3, 5, 0x00, 0x10, 18, 3),
 	PIN_FIELD_BASE(4, 4, 5, 0x00, 0x10, 0, 3),
-	PIN_FIELD_BASE(5, 6, 5, 0x00, 0x10, 9, 3),
+	PIN_FIELD_BASE(5, 5, 5, 0x00, 0x10, 9, 3),
+	PIN_FIELD_BASE(6, 6, 5, 0x00, 0x10, 12, 3),
+
 	PIN_FIELD_BASE(7, 7, 4, 0x00, 0x10, 24, 3),
 	PIN_FIELD_BASE(8, 8, 4, 0x00, 0x10, 28, 3),
 	PIN_FIELD_BASE(9, 9, 4, 0x00, 0x10, 15, 3),
 	PIN_FIELD_BASE(10, 10, 4, 0x00, 0x10, 9, 3),
+
 	PIN_FIELD_BASE(11, 11, 1, 0x00, 0x10, 0, 3),
 	PIN_FIELD_BASE(12, 12, 1, 0x20, 0x10, 3, 3),
-	PIN_FIELD_BASE(13, 14, 1, 0x00, 0x10, 3, 3),
+	PIN_FIELD_BASE(13, 13, 1, 0x00, 0x10, 3, 3),
+	PIN_FIELD_BASE(14, 14, 1, 0x00, 0x10, 6, 3),
+
 	PIN_FIELD_BASE(19, 19, 4, 0x00, 0x10, 21, 3),
 	PIN_FIELD_BASE(20, 20, 4, 0x00, 0x10, 12, 3),
+
 	PIN_FIELD_BASE(21, 21, 3, 0x10, 0x10, 21, 3),
 	PIN_FIELD_BASE(22, 22, 3, 0x20, 0x10, 9, 3),
 	PIN_FIELD_BASE(23, 23, 3, 0x20, 0x10, 0, 3),
 	PIN_FIELD_BASE(24, 24, 3, 0x10, 0x10, 27, 3),
-	PIN_FIELD_BASE(25, 26, 3, 0x20, 0x10, 3, 3),
+	PIN_FIELD_BASE(25, 25, 3, 0x20, 0x10, 3, 3),
+	PIN_FIELD_BASE(26, 26, 3, 0x20, 0x10, 6, 3),
 	PIN_FIELD_BASE(27, 27, 3, 0x10, 0x10, 24, 3),
-	PIN_FIELD_BASE(28, 30, 3, 0x20, 0x10, 15, 3),
+	PIN_FIELD_BASE(28, 28, 3, 0x20, 0x10, 15, 3),
+	PIN_FIELD_BASE(29, 29, 3, 0x20, 0x10, 18, 3),
+	PIN_FIELD_BASE(30, 30, 3, 0x20, 0x10, 21, 3),
 	PIN_FIELD_BASE(31, 31, 3, 0x20, 0x10, 12, 3),
 	PIN_FIELD_BASE(32, 32, 3, 0x20, 0x10, 24, 3),
 	PIN_FIELD_BASE(33, 33, 3, 0x30, 0x10, 6, 3),
@@ -232,7 +320,8 @@ static const struct mtk_pin_field_calc mt7988_pin_drv_range[] = {
 	PIN_FIELD_BASE(37, 37, 3, 0x30, 0x10, 9, 3),
 	PIN_FIELD_BASE(38, 38, 3, 0x10, 0x10, 3, 3),
 	PIN_FIELD_BASE(39, 39, 3, 0x10, 0x10, 0, 3),
-	PIN_FIELD_BASE(40, 41, 3, 0x00, 0x10, 0, 3),
+	PIN_FIELD_BASE(40, 40, 3, 0x00, 0x10, 0, 3),
+	PIN_FIELD_BASE(41, 41, 3, 0x00, 0x10, 3, 3),
 	PIN_FIELD_BASE(42, 42, 3, 0x00, 0x10, 27, 3),
 	PIN_FIELD_BASE(43, 43, 3, 0x00, 0x10, 24, 3),
 	PIN_FIELD_BASE(44, 44, 3, 0x00, 0x10, 21, 3),
@@ -242,17 +331,29 @@ static const struct mtk_pin_field_calc mt7988_pin_drv_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0x00, 0x10, 9, 3),
 	PIN_FIELD_BASE(49, 49, 3, 0x00, 0x10, 6, 3),
 	PIN_FIELD_BASE(50, 50, 3, 0x10, 0x10, 15, 3),
-	PIN_FIELD_BASE(51, 53, 3, 0x10, 0x10, 6, 3),
+	PIN_FIELD_BASE(51, 51, 3, 0x10, 0x10, 6, 3),
+	PIN_FIELD_BASE(52, 52, 3, 0x10, 0x10, 9, 3),
+	PIN_FIELD_BASE(53, 53, 3, 0x10, 0x10, 12, 3),
 	PIN_FIELD_BASE(54, 54, 3, 0x10, 0x10, 18, 3),
-	PIN_FIELD_BASE(55, 56, 1, 0x10, 0x10, 12, 3),
+
+	PIN_FIELD_BASE(55, 55, 1, 0x10, 0x10, 12, 3),
+	PIN_FIELD_BASE(56, 56, 1, 0x10, 0x10, 15, 3),
 	PIN_FIELD_BASE(57, 57, 1, 0x10, 0x10, 9, 3),
-	PIN_FIELD_BASE(58, 60, 1, 0x00, 0x10, 12, 3),
+	PIN_FIELD_BASE(58, 58, 1, 0x00, 0x10, 12, 3),
+	PIN_FIELD_BASE(59, 59, 1, 0x00, 0x10, 15, 3),
+	PIN_FIELD_BASE(60, 60, 1, 0x00, 0x10, 18, 3),
 	PIN_FIELD_BASE(61, 61, 1, 0x00, 0x10, 9, 3),
 	PIN_FIELD_BASE(62, 62, 1, 0x00, 0x10, 21, 3),
 	PIN_FIELD_BASE(63, 63, 1, 0x20, 0x10, 0, 3),
-	PIN_FIELD_BASE(64, 65, 1, 0x00, 0x10, 24, 3),
-	PIN_FIELD_BASE(66, 68, 1, 0x10, 0x10, 0, 3),
-	PIN_FIELD_BASE(69, 70, 5, 0x00, 0x10, 3, 3),
+	PIN_FIELD_BASE(64, 64, 1, 0x00, 0x10, 24, 3),
+	PIN_FIELD_BASE(65, 65, 1, 0x00, 0x10, 27, 3),
+	PIN_FIELD_BASE(66, 66, 1, 0x10, 0x10, 0, 3),
+	PIN_FIELD_BASE(67, 67, 1, 0x10, 0x10, 3, 3),
+	PIN_FIELD_BASE(68, 68, 1, 0x10, 0x10, 6, 3),
+
+	PIN_FIELD_BASE(69, 69, 5, 0x00, 0x10, 3, 3),
+	PIN_FIELD_BASE(70, 70, 5, 0x00, 0x10, 6, 3),
+
 	PIN_FIELD_BASE(73, 73, 4, 0x10, 0x10, 0, 3),
 	PIN_FIELD_BASE(74, 74, 4, 0x00, 0x10, 3, 3),
 	PIN_FIELD_BASE(75, 75, 4, 0x10, 0x10, 3, 3),
@@ -260,35 +361,49 @@ static const struct mtk_pin_field_calc mt7988_pin_drv_range[] = {
 	PIN_FIELD_BASE(77, 77, 4, 0x00, 0x10, 6, 3),
 	PIN_FIELD_BASE(78, 78, 4, 0x00, 0x10, 0, 3),
 	PIN_FIELD_BASE(79, 79, 4, 0x10, 0x10, 6, 3),
-	PIN_FIELD_BASE(80, 81, 1, 0x10, 0x10, 24, 3),
-	PIN_FIELD_BASE(82, 83, 1, 0x10, 0x10, 18, 3),
+
+	PIN_FIELD_BASE(80, 80, 1, 0x10, 0x10, 24, 3),
+	PIN_FIELD_BASE(81, 81, 1, 0x10, 0x10, 27, 3),
+	PIN_FIELD_BASE(82, 82, 1, 0x10, 0x10, 18, 3),
+	PIN_FIELD_BASE(83, 83, 1, 0x10, 0x10, 21, 3),
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_pupd_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0x50, 0x10, 7, 1),
-	PIN_FIELD_BASE(2, 3, 5, 0x50, 0x10, 5, 1),
+	PIN_FIELD_BASE(0, 0, 5, 0x50, 0x10, 7, 1),
+	PIN_FIELD_BASE(1, 1, 5, 0x50, 0x10, 8, 1),
+	PIN_FIELD_BASE(2, 2, 5, 0x50, 0x10, 5, 1),
+	PIN_FIELD_BASE(3, 3, 5, 0x50, 0x10, 6, 1),
 	PIN_FIELD_BASE(4, 4, 5, 0x50, 0x10, 0, 1),
-	PIN_FIELD_BASE(5, 6, 5, 0x50, 0x10, 3, 1),
+	PIN_FIELD_BASE(5, 5, 5, 0x50, 0x10, 3, 1),
+	PIN_FIELD_BASE(6, 6, 5, 0x50, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(11, 11, 1, 0x60, 0x10, 0, 1),
 	PIN_FIELD_BASE(12, 12, 1, 0x60, 0x10, 18, 1),
+
 	PIN_FIELD_BASE(19, 19, 4, 0x50, 0x10, 2, 1),
 	PIN_FIELD_BASE(20, 20, 4, 0x50, 0x10, 1, 1),
+
 	PIN_FIELD_BASE(21, 21, 3, 0x70, 0x10, 17, 1),
 	PIN_FIELD_BASE(22, 22, 3, 0x70, 0x10, 23, 1),
 	PIN_FIELD_BASE(23, 23, 3, 0x70, 0x10, 20, 1),
 	PIN_FIELD_BASE(24, 24, 3, 0x70, 0x10, 19, 1),
-	PIN_FIELD_BASE(25, 26, 3, 0x70, 0x10, 21, 1),
+	PIN_FIELD_BASE(25, 25, 3, 0x70, 0x10, 21, 1),
+	PIN_FIELD_BASE(26, 26, 3, 0x70, 0x10, 22, 1),
 	PIN_FIELD_BASE(27, 27, 3, 0x70, 0x10, 18, 1),
-	PIN_FIELD_BASE(28, 30, 3, 0x70, 0x10, 25, 1),
+	PIN_FIELD_BASE(28, 28, 3, 0x70, 0x10, 25, 1),
+	PIN_FIELD_BASE(29, 29, 3, 0x70, 0x10, 26, 1),
+	PIN_FIELD_BASE(30, 30, 3, 0x70, 0x10, 27, 1),
 	PIN_FIELD_BASE(31, 31, 3, 0x70, 0x10, 24, 1),
 	PIN_FIELD_BASE(32, 32, 3, 0x70, 0x10, 28, 1),
 	PIN_FIELD_BASE(33, 33, 3, 0x80, 0x10, 0, 1),
 	PIN_FIELD_BASE(34, 34, 3, 0x70, 0x10, 31, 1),
-	PIN_FIELD_BASE(35, 36, 3, 0x70, 0x10, 29, 1),
+	PIN_FIELD_BASE(35, 35, 3, 0x70, 0x10, 29, 1),
+	PIN_FIELD_BASE(36, 36, 3, 0x70, 0x10, 30, 1),
 	PIN_FIELD_BASE(37, 37, 3, 0x80, 0x10, 1, 1),
 	PIN_FIELD_BASE(38, 38, 3, 0x70, 0x10, 11, 1),
 	PIN_FIELD_BASE(39, 39, 3, 0x70, 0x10, 10, 1),
-	PIN_FIELD_BASE(40, 41, 3, 0x70, 0x10, 0, 1),
+	PIN_FIELD_BASE(40, 40, 3, 0x70, 0x10, 0, 1),
+	PIN_FIELD_BASE(41, 41, 3, 0x70, 0x10, 1, 1),
 	PIN_FIELD_BASE(42, 42, 3, 0x70, 0x10, 9, 1),
 	PIN_FIELD_BASE(43, 43, 3, 0x70, 0x10, 8, 1),
 	PIN_FIELD_BASE(44, 44, 3, 0x70, 0x10, 7, 1),
@@ -298,46 +413,73 @@ static const struct mtk_pin_field_calc mt7988_pin_pupd_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0x70, 0x10, 3, 1),
 	PIN_FIELD_BASE(49, 49, 3, 0x70, 0x10, 2, 1),
 	PIN_FIELD_BASE(50, 50, 3, 0x70, 0x10, 15, 1),
-	PIN_FIELD_BASE(51, 53, 3, 0x70, 0x10, 12, 1),
+	PIN_FIELD_BASE(51, 51, 3, 0x70, 0x10, 12, 1),
+	PIN_FIELD_BASE(52, 52, 3, 0x70, 0x10, 13, 1),
+	PIN_FIELD_BASE(53, 53, 3, 0x70, 0x10, 14, 1),
 	PIN_FIELD_BASE(54, 54, 3, 0x70, 0x10, 16, 1),
-	PIN_FIELD_BASE(55, 56, 1, 0x60, 0x10, 12, 1),
+
+	PIN_FIELD_BASE(55, 55, 1, 0x60, 0x10, 12, 1),
+	PIN_FIELD_BASE(56, 56, 1, 0x60, 0x10, 13, 1),
 	PIN_FIELD_BASE(57, 57, 1, 0x60, 0x10, 11, 1),
-	PIN_FIELD_BASE(58, 60, 1, 0x60, 0x10, 2, 1),
+	PIN_FIELD_BASE(58, 58, 1, 0x60, 0x10, 2, 1),
+	PIN_FIELD_BASE(59, 59, 1, 0x60, 0x10, 3, 1),
+	PIN_FIELD_BASE(60, 60, 1, 0x60, 0x10, 4, 1),
 	PIN_FIELD_BASE(61, 61, 1, 0x60, 0x10, 1, 1),
 	PIN_FIELD_BASE(62, 62, 1, 0x60, 0x10, 5, 1),
-	PIN_FIELD_BASE(64, 68, 1, 0x60, 0x10, 6, 1),
-	PIN_FIELD_BASE(69, 70, 5, 0x50, 0x10, 1, 1),
+	PIN_FIELD_BASE(64, 64, 1, 0x60, 0x10, 6, 1),
+	PIN_FIELD_BASE(65, 65, 1, 0x60, 0x10, 7, 1),
+	PIN_FIELD_BASE(66, 66, 1, 0x60, 0x10, 8, 1),
+	PIN_FIELD_BASE(67, 67, 1, 0x60, 0x10, 9, 1),
+	PIN_FIELD_BASE(68, 68, 1, 0x60, 0x10, 10, 1),
+
+	PIN_FIELD_BASE(69, 69, 5, 0x50, 0x10, 1, 1),
+	PIN_FIELD_BASE(70, 70, 5, 0x50, 0x10, 2, 1),
+
 	PIN_FIELD_BASE(73, 73, 4, 0x50, 0x10, 3, 1),
 	PIN_FIELD_BASE(74, 74, 4, 0x50, 0x10, 0, 1),
-	PIN_FIELD_BASE(80, 81, 1, 0x60, 0x10, 16, 1),
-	PIN_FIELD_BASE(82, 83, 1, 0x60, 0x10, 14, 1),
+
+	PIN_FIELD_BASE(80, 80, 1, 0x60, 0x10, 16, 1),
+	PIN_FIELD_BASE(81, 81, 1, 0x60, 0x10, 17, 1),
+	PIN_FIELD_BASE(82, 82, 1, 0x60, 0x10, 14, 1),
+	PIN_FIELD_BASE(83, 83, 1, 0x60, 0x10, 15, 1),
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_r0_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0x60, 0x10, 7, 1),
-	PIN_FIELD_BASE(2, 3, 5, 0x60, 0x10, 5, 1),
+	PIN_FIELD_BASE(0, 0, 5, 0x60, 0x10, 7, 1),
+	PIN_FIELD_BASE(1, 1, 5, 0x60, 0x10, 8, 1),
+	PIN_FIELD_BASE(2, 2, 5, 0x60, 0x10, 5, 1),
+	PIN_FIELD_BASE(3, 3, 5, 0x60, 0x10, 6, 1),
 	PIN_FIELD_BASE(4, 4, 5, 0x60, 0x10, 0, 1),
-	PIN_FIELD_BASE(5, 6, 5, 0x60, 0x10, 3, 1),
+	PIN_FIELD_BASE(5, 5, 5, 0x60, 0x10, 3, 1),
+	PIN_FIELD_BASE(6, 6, 5, 0x60, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(11, 11, 1, 0x80, 0x10, 0, 1),
 	PIN_FIELD_BASE(12, 12, 1, 0x80, 0x10, 18, 1),
+
 	PIN_FIELD_BASE(19, 19, 4, 0x70, 0x10, 2, 1),
 	PIN_FIELD_BASE(20, 20, 4, 0x70, 0x10, 1, 1),
+
 	PIN_FIELD_BASE(21, 21, 3, 0x90, 0x10, 17, 1),
 	PIN_FIELD_BASE(22, 22, 3, 0x90, 0x10, 23, 1),
 	PIN_FIELD_BASE(23, 23, 3, 0x90, 0x10, 20, 1),
 	PIN_FIELD_BASE(24, 24, 3, 0x90, 0x10, 19, 1),
-	PIN_FIELD_BASE(25, 26, 3, 0x90, 0x10, 21, 1),
+	PIN_FIELD_BASE(25, 25, 3, 0x90, 0x10, 21, 1),
+	PIN_FIELD_BASE(26, 26, 3, 0x90, 0x10, 22, 1),
 	PIN_FIELD_BASE(27, 27, 3, 0x90, 0x10, 18, 1),
-	PIN_FIELD_BASE(28, 30, 3, 0x90, 0x10, 25, 1),
+	PIN_FIELD_BASE(28, 28, 3, 0x90, 0x10, 25, 1),
+	PIN_FIELD_BASE(29, 29, 3, 0x90, 0x10, 26, 1),
+	PIN_FIELD_BASE(30, 30, 3, 0x90, 0x10, 27, 1),
 	PIN_FIELD_BASE(31, 31, 3, 0x90, 0x10, 24, 1),
 	PIN_FIELD_BASE(32, 32, 3, 0x90, 0x10, 28, 1),
 	PIN_FIELD_BASE(33, 33, 3, 0xa0, 0x10, 0, 1),
 	PIN_FIELD_BASE(34, 34, 3, 0x90, 0x10, 31, 1),
-	PIN_FIELD_BASE(35, 36, 3, 0x90, 0x10, 29, 1),
+	PIN_FIELD_BASE(35, 35, 3, 0x90, 0x10, 29, 1),
+	PIN_FIELD_BASE(36, 36, 3, 0x90, 0x10, 30, 1),
 	PIN_FIELD_BASE(37, 37, 3, 0xa0, 0x10, 1, 1),
 	PIN_FIELD_BASE(38, 38, 3, 0x90, 0x10, 11, 1),
 	PIN_FIELD_BASE(39, 39, 3, 0x90, 0x10, 10, 1),
-	PIN_FIELD_BASE(40, 41, 3, 0x90, 0x10, 0, 1),
+	PIN_FIELD_BASE(40, 40, 3, 0x90, 0x10, 0, 1),
+	PIN_FIELD_BASE(41, 41, 3, 0x90, 0x10, 1, 1),
 	PIN_FIELD_BASE(42, 42, 3, 0x90, 0x10, 9, 1),
 	PIN_FIELD_BASE(43, 43, 3, 0x90, 0x10, 8, 1),
 	PIN_FIELD_BASE(44, 44, 3, 0x90, 0x10, 7, 1),
@@ -347,46 +489,73 @@ static const struct mtk_pin_field_calc mt7988_pin_r0_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0x90, 0x10, 3, 1),
 	PIN_FIELD_BASE(49, 49, 3, 0x90, 0x10, 2, 1),
 	PIN_FIELD_BASE(50, 50, 3, 0x90, 0x10, 15, 1),
-	PIN_FIELD_BASE(51, 53, 3, 0x90, 0x10, 12, 1),
+	PIN_FIELD_BASE(51, 51, 3, 0x90, 0x10, 12, 1),
+	PIN_FIELD_BASE(52, 52, 3, 0x90, 0x10, 13, 1),
+	PIN_FIELD_BASE(53, 53, 3, 0x90, 0x10, 14, 1),
 	PIN_FIELD_BASE(54, 54, 3, 0x90, 0x10, 16, 1),
-	PIN_FIELD_BASE(55, 56, 1, 0x80, 0x10, 12, 1),
+
+	PIN_FIELD_BASE(55, 55, 1, 0x80, 0x10, 12, 1),
+	PIN_FIELD_BASE(56, 56, 1, 0x80, 0x10, 13, 1),
 	PIN_FIELD_BASE(57, 57, 1, 0x80, 0x10, 11, 1),
-	PIN_FIELD_BASE(58, 60, 1, 0x80, 0x10, 2, 1),
+	PIN_FIELD_BASE(58, 58, 1, 0x80, 0x10, 2, 1),
+	PIN_FIELD_BASE(59, 59, 1, 0x80, 0x10, 3, 1),
+	PIN_FIELD_BASE(60, 60, 1, 0x80, 0x10, 4, 1),
 	PIN_FIELD_BASE(61, 61, 1, 0x80, 0x10, 1, 1),
 	PIN_FIELD_BASE(62, 62, 1, 0x80, 0x10, 5, 1),
-	PIN_FIELD_BASE(64, 68, 1, 0x80, 0x10, 6, 1),
-	PIN_FIELD_BASE(69, 70, 5, 0x60, 0x10, 1, 1),
+	PIN_FIELD_BASE(64, 64, 1, 0x80, 0x10, 6, 1),
+	PIN_FIELD_BASE(65, 65, 1, 0x80, 0x10, 7, 1),
+	PIN_FIELD_BASE(66, 66, 1, 0x80, 0x10, 8, 1),
+	PIN_FIELD_BASE(67, 67, 1, 0x80, 0x10, 9, 1),
+	PIN_FIELD_BASE(68, 68, 1, 0x80, 0x10, 10, 1),
+
+	PIN_FIELD_BASE(69, 69, 5, 0x60, 0x10, 1, 1),
+	PIN_FIELD_BASE(70, 70, 5, 0x60, 0x10, 2, 1),
+
 	PIN_FIELD_BASE(73, 73, 4, 0x70, 0x10, 3, 1),
 	PIN_FIELD_BASE(74, 74, 4, 0x70, 0x10, 0, 1),
-	PIN_FIELD_BASE(80, 81, 1, 0x80, 0x10, 16, 1),
-	PIN_FIELD_BASE(82, 83, 1, 0x80, 0x10, 14, 1),
+
+	PIN_FIELD_BASE(80, 80, 1, 0x80, 0x10, 16, 1),
+	PIN_FIELD_BASE(81, 81, 1, 0x80, 0x10, 17, 1),
+	PIN_FIELD_BASE(82, 82, 1, 0x80, 0x10, 14, 1),
+	PIN_FIELD_BASE(83, 83, 1, 0x80, 0x10, 15, 1),
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_r1_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0x70, 0x10, 7, 1),
-	PIN_FIELD_BASE(2, 3, 5, 0x70, 0x10, 5, 1),
+	PIN_FIELD_BASE(0, 0, 5, 0x70, 0x10, 7, 1),
+	PIN_FIELD_BASE(1, 1, 5, 0x70, 0x10, 8, 1),
+	PIN_FIELD_BASE(2, 2, 5, 0x70, 0x10, 5, 1),
+	PIN_FIELD_BASE(3, 3, 5, 0x70, 0x10, 6, 1),
 	PIN_FIELD_BASE(4, 4, 5, 0x70, 0x10, 0, 1),
-	PIN_FIELD_BASE(5, 6, 5, 0x70, 0x10, 3, 1),
+	PIN_FIELD_BASE(5, 5, 5, 0x70, 0x10, 3, 1),
+	PIN_FIELD_BASE(6, 6, 5, 0x70, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(11, 11, 1, 0x90, 0x10, 0, 1),
 	PIN_FIELD_BASE(12, 12, 1, 0x90, 0x10, 18, 1),
+
 	PIN_FIELD_BASE(19, 19, 4, 0x80, 0x10, 2, 1),
 	PIN_FIELD_BASE(20, 20, 4, 0x80, 0x10, 1, 1),
+
 	PIN_FIELD_BASE(21, 21, 3, 0xb0, 0x10, 17, 1),
 	PIN_FIELD_BASE(22, 22, 3, 0xb0, 0x10, 23, 1),
 	PIN_FIELD_BASE(23, 23, 3, 0xb0, 0x10, 20, 1),
 	PIN_FIELD_BASE(24, 24, 3, 0xb0, 0x10, 19, 1),
-	PIN_FIELD_BASE(25, 26, 3, 0xb0, 0x10, 21, 1),
+	PIN_FIELD_BASE(25, 25, 3, 0xb0, 0x10, 21, 1),
+	PIN_FIELD_BASE(26, 26, 3, 0xb0, 0x10, 22, 1),
 	PIN_FIELD_BASE(27, 27, 3, 0xb0, 0x10, 18, 1),
-	PIN_FIELD_BASE(28, 30, 3, 0xb0, 0x10, 25, 1),
+	PIN_FIELD_BASE(28, 28, 3, 0xb0, 0x10, 25, 1),
+	PIN_FIELD_BASE(29, 29, 3, 0xb0, 0x10, 26, 1),
+	PIN_FIELD_BASE(30, 30, 3, 0xb0, 0x10, 27, 1),
 	PIN_FIELD_BASE(31, 31, 3, 0xb0, 0x10, 24, 1),
 	PIN_FIELD_BASE(32, 32, 3, 0xb0, 0x10, 28, 1),
 	PIN_FIELD_BASE(33, 33, 3, 0xc0, 0x10, 0, 1),
 	PIN_FIELD_BASE(34, 34, 3, 0xb0, 0x10, 31, 1),
-	PIN_FIELD_BASE(35, 36, 3, 0xb0, 0x10, 29, 1),
+	PIN_FIELD_BASE(35, 35, 3, 0xb0, 0x10, 29, 1),
+	PIN_FIELD_BASE(36, 36, 3, 0xb0, 0x10, 30, 1),
 	PIN_FIELD_BASE(37, 37, 3, 0xc0, 0x10, 1, 1),
 	PIN_FIELD_BASE(38, 38, 3, 0xb0, 0x10, 11, 1),
 	PIN_FIELD_BASE(39, 39, 3, 0xb0, 0x10, 10, 1),
-	PIN_FIELD_BASE(40, 41, 3, 0xb0, 0x10, 0, 1),
+	PIN_FIELD_BASE(40, 40, 3, 0xb0, 0x10, 0, 1),
+	PIN_FIELD_BASE(41, 41, 3, 0xb0, 0x10, 1, 1),
 	PIN_FIELD_BASE(42, 42, 3, 0xb0, 0x10, 9, 1),
 	PIN_FIELD_BASE(43, 43, 3, 0xb0, 0x10, 8, 1),
 	PIN_FIELD_BASE(44, 44, 3, 0xb0, 0x10, 7, 1),
@@ -396,19 +565,35 @@ static const struct mtk_pin_field_calc mt7988_pin_r1_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0xb0, 0x10, 3, 1),
 	PIN_FIELD_BASE(49, 49, 3, 0xb0, 0x10, 2, 1),
 	PIN_FIELD_BASE(50, 50, 3, 0xb0, 0x10, 15, 1),
-	PIN_FIELD_BASE(51, 53, 3, 0xb0, 0x10, 12, 1),
+	PIN_FIELD_BASE(51, 51, 3, 0xb0, 0x10, 12, 1),
+	PIN_FIELD_BASE(52, 52, 3, 0xb0, 0x10, 13, 1),
+	PIN_FIELD_BASE(53, 53, 3, 0xb0, 0x10, 14, 1),
 	PIN_FIELD_BASE(54, 54, 3, 0xb0, 0x10, 16, 1),
-	PIN_FIELD_BASE(55, 56, 1, 0x90, 0x10, 12, 1),
+
+	PIN_FIELD_BASE(55, 55, 1, 0x90, 0x10, 12, 1),
+	PIN_FIELD_BASE(56, 56, 1, 0x90, 0x10, 13, 1),
 	PIN_FIELD_BASE(57, 57, 1, 0x90, 0x10, 11, 1),
-	PIN_FIELD_BASE(58, 60, 1, 0x90, 0x10, 2, 1),
+	PIN_FIELD_BASE(58, 58, 1, 0x90, 0x10, 2, 1),
+	PIN_FIELD_BASE(59, 59, 1, 0x90, 0x10, 3, 1),
+	PIN_FIELD_BASE(60, 60, 1, 0x90, 0x10, 4, 1),
 	PIN_FIELD_BASE(61, 61, 1, 0x90, 0x10, 1, 1),
 	PIN_FIELD_BASE(62, 62, 1, 0x90, 0x10, 5, 1),
-	PIN_FIELD_BASE(64, 68, 1, 0x90, 0x10, 6, 1),
-	PIN_FIELD_BASE(69, 70, 5, 0x70, 0x10, 1, 1),
+	PIN_FIELD_BASE(64, 64, 1, 0x90, 0x10, 6, 1),
+	PIN_FIELD_BASE(65, 65, 1, 0x90, 0x10, 7, 1),
+	PIN_FIELD_BASE(66, 66, 1, 0x90, 0x10, 8, 1),
+	PIN_FIELD_BASE(67, 67, 1, 0x90, 0x10, 9, 1),
+	PIN_FIELD_BASE(68, 68, 1, 0x90, 0x10, 10, 1),
+
+	PIN_FIELD_BASE(69, 69, 5, 0x70, 0x10, 1, 1),
+	PIN_FIELD_BASE(70, 70, 5, 0x70, 0x10, 2, 1),
+
 	PIN_FIELD_BASE(73, 73, 4, 0x80, 0x10, 3, 1),
 	PIN_FIELD_BASE(74, 74, 4, 0x80, 0x10, 0, 1),
-	PIN_FIELD_BASE(80, 81, 1, 0x90, 0x10, 16, 1),
-	PIN_FIELD_BASE(82, 83, 1, 0x90, 0x10, 14, 1),
+
+	PIN_FIELD_BASE(80, 80, 1, 0x90, 0x10, 16, 1),
+	PIN_FIELD_BASE(81, 81, 1, 0x90, 0x10, 17, 1),
+	PIN_FIELD_BASE(82, 82, 1, 0x90, 0x10, 14, 1),
+	PIN_FIELD_BASE(83, 83, 1, 0x90, 0x10, 15, 1),
 };
 
 static const struct mtk_pin_reg_calc mt7988_reg_cals[] = {
diff --git a/lede/target/linux/mediatek/files-6.1/drivers/pinctrl/mediatek/pinctrl-mt7988.c b/lede/target/linux/mediatek/files-6.1/drivers/pinctrl/mediatek/pinctrl-mt7988.c
index da0269ed7a..49c0be1bba 100644
--- a/lede/target/linux/mediatek/files-6.1/drivers/pinctrl/mediatek/pinctrl-mt7988.c
+++ b/lede/target/linux/mediatek/files-6.1/drivers/pinctrl/mediatek/pinctrl-mt7988.c
@@ -46,37 +46,53 @@ static const struct mtk_pin_field_calc mt7988_pin_do_range[] = {
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_ies_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0x30, 0x10, 13, 1),
-	PIN_FIELD_BASE(2, 3, 5, 0x30, 0x10, 11, 1),
+	PIN_FIELD_BASE(0, 0, 5, 0x30, 0x10, 13, 1),
+	PIN_FIELD_BASE(1, 1, 5, 0x30, 0x10, 14, 1),
+	PIN_FIELD_BASE(2, 2, 5, 0x30, 0x10, 11, 1),
+	PIN_FIELD_BASE(3, 3, 5, 0x30, 0x10, 12, 1),
 	PIN_FIELD_BASE(4, 4, 5, 0x30, 0x10, 0, 1),
-	PIN_FIELD_BASE(5, 6, 5, 0x30, 0x10, 9, 1),
+	PIN_FIELD_BASE(5, 5, 5, 0x30, 0x10, 9, 1),
+	PIN_FIELD_BASE(6, 6, 5, 0x30, 0x10, 10, 1),
+
 	PIN_FIELD_BASE(7, 7, 4, 0x30, 0x10, 8, 1),
 	PIN_FIELD_BASE(8, 8, 4, 0x30, 0x10, 6, 1),
 	PIN_FIELD_BASE(9, 9, 4, 0x30, 0x10, 5, 1),
 	PIN_FIELD_BASE(10, 10, 4, 0x30, 0x10, 3, 1),
+
 	PIN_FIELD_BASE(11, 11, 1, 0x40, 0x10, 0, 1),
 	PIN_FIELD_BASE(12, 12, 1, 0x40, 0x10, 21, 1),
-	PIN_FIELD_BASE(13, 14, 1, 0x40, 0x10, 1, 1),
-	PIN_FIELD_BASE(15, 16, 5, 0x30, 0x10, 7, 1),
-	PIN_FIELD_BASE(17, 18, 5, 0x30, 0x10, 3, 1),
+	PIN_FIELD_BASE(13, 13, 1, 0x40, 0x10, 1, 1),
+	PIN_FIELD_BASE(14, 14, 1, 0x40, 0x10, 2, 1),
+
+	PIN_FIELD_BASE(15, 15, 5, 0x30, 0x10, 7, 1),
+	PIN_FIELD_BASE(16, 16, 5, 0x30, 0x10, 8, 1),
+	PIN_FIELD_BASE(17, 17, 5, 0x30, 0x10, 3, 1),
+	PIN_FIELD_BASE(18, 18, 5, 0x30, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(19, 19, 4, 0x30, 0x10, 7, 1),
 	PIN_FIELD_BASE(20, 20, 4, 0x30, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(21, 21, 3, 0x50, 0x10, 17, 1),
 	PIN_FIELD_BASE(22, 22, 3, 0x50, 0x10, 23, 1),
 	PIN_FIELD_BASE(23, 23, 3, 0x50, 0x10, 20, 1),
 	PIN_FIELD_BASE(24, 24, 3, 0x50, 0x10, 19, 1),
-	PIN_FIELD_BASE(25, 26, 3, 0x50, 0x10, 21, 1),
+	PIN_FIELD_BASE(25, 25, 3, 0x50, 0x10, 21, 1),
+	PIN_FIELD_BASE(26, 26, 3, 0x50, 0x10, 22, 1),
 	PIN_FIELD_BASE(27, 27, 3, 0x50, 0x10, 18, 1),
-	PIN_FIELD_BASE(28, 30, 3, 0x50, 0x10, 25, 1),
+	PIN_FIELD_BASE(28, 28, 3, 0x50, 0x10, 25, 1),
+	PIN_FIELD_BASE(29, 29, 3, 0x50, 0x10, 26, 1),
+	PIN_FIELD_BASE(30, 30, 3, 0x50, 0x10, 27, 1),
 	PIN_FIELD_BASE(31, 31, 3, 0x50, 0x10, 24, 1),
 	PIN_FIELD_BASE(32, 32, 3, 0x50, 0x10, 28, 1),
 	PIN_FIELD_BASE(33, 33, 3, 0x60, 0x10, 0, 1),
 	PIN_FIELD_BASE(34, 34, 3, 0x50, 0x10, 31, 1),
-	PIN_FIELD_BASE(35, 36, 3, 0x50, 0x10, 29, 1),
+	PIN_FIELD_BASE(35, 35, 3, 0x50, 0x10, 29, 1),
+	PIN_FIELD_BASE(36, 36, 3, 0x50, 0x10, 30, 1),
 	PIN_FIELD_BASE(37, 37, 3, 0x60, 0x10, 1, 1),
 	PIN_FIELD_BASE(38, 38, 3, 0x50, 0x10, 11, 1),
 	PIN_FIELD_BASE(39, 39, 3, 0x50, 0x10, 10, 1),
-	PIN_FIELD_BASE(40, 41, 3, 0x50, 0x10, 0, 1),
+	PIN_FIELD_BASE(40, 40, 3, 0x50, 0x10, 0, 1),
+	PIN_FIELD_BASE(41, 41, 3, 0x50, 0x10, 1, 1),
 	PIN_FIELD_BASE(42, 42, 3, 0x50, 0x10, 9, 1),
 	PIN_FIELD_BASE(43, 43, 3, 0x50, 0x10, 8, 1),
 	PIN_FIELD_BASE(44, 44, 3, 0x50, 0x10, 7, 1),
@@ -86,17 +102,31 @@ static const struct mtk_pin_field_calc mt7988_pin_ies_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0x50, 0x10, 3, 1),
 	PIN_FIELD_BASE(49, 49, 3, 0x50, 0x10, 2, 1),
 	PIN_FIELD_BASE(50, 50, 3, 0x50, 0x10, 15, 1),
-	PIN_FIELD_BASE(51, 53, 3, 0x50, 0x10, 12, 1),
+	PIN_FIELD_BASE(51, 51, 3, 0x50, 0x10, 12, 1),
+	PIN_FIELD_BASE(52, 52, 3, 0x50, 0x10, 13, 1),
+	PIN_FIELD_BASE(53, 53, 3, 0x50, 0x10, 14, 1),
 	PIN_FIELD_BASE(54, 54, 3, 0x50, 0x10, 16, 1),
-	PIN_FIELD_BASE(55, 56, 1, 0x40, 0x10, 14, 1),
+
+	PIN_FIELD_BASE(55, 55, 1, 0x40, 0x10, 14, 1),
+	PIN_FIELD_BASE(56, 56, 1, 0x40, 0x10, 15, 1),
 	PIN_FIELD_BASE(57, 57, 1, 0x40, 0x10, 13, 1),
-	PIN_FIELD_BASE(58, 60, 1, 0x40, 0x10, 4, 1),
+	PIN_FIELD_BASE(58, 58, 1, 0x40, 0x10, 4, 1),
+	PIN_FIELD_BASE(59, 59, 1, 0x40, 0x10, 5, 1),
+	PIN_FIELD_BASE(60, 60, 1, 0x40, 0x10, 6, 1),
 	PIN_FIELD_BASE(61, 61, 1, 0x40, 0x10, 3, 1),
 	PIN_FIELD_BASE(62, 62, 1, 0x40, 0x10, 7, 1),
 	PIN_FIELD_BASE(63, 63, 1, 0x40, 0x10, 20, 1),
-	PIN_FIELD_BASE(64, 68, 1, 0x40, 0x10, 8, 1),
-	PIN_FIELD_BASE(69, 70, 5, 0x30, 0x10, 1, 1),
-	PIN_FIELD_BASE(71, 72, 5, 0x30, 0x10, 5, 1),
+	PIN_FIELD_BASE(64, 64, 1, 0x40, 0x10, 8, 1),
+	PIN_FIELD_BASE(65, 65, 1, 0x40, 0x10, 9, 1),
+	PIN_FIELD_BASE(66, 66, 1, 0x40, 0x10, 10, 1),
+	PIN_FIELD_BASE(67, 67, 1, 0x40, 0x10, 11, 1),
+	PIN_FIELD_BASE(68, 68, 1, 0x40, 0x10, 12, 1),
+
+	PIN_FIELD_BASE(69, 69, 5, 0x30, 0x10, 1, 1),
+	PIN_FIELD_BASE(70, 70, 5, 0x30, 0x10, 2, 1),
+	PIN_FIELD_BASE(71, 71, 5, 0x30, 0x10, 5, 1),
+	PIN_FIELD_BASE(72, 72, 5, 0x30, 0x10, 6, 1),
+
 	PIN_FIELD_BASE(73, 73, 4, 0x30, 0x10, 10, 1),
 	PIN_FIELD_BASE(74, 74, 4, 0x30, 0x10, 1, 1),
 	PIN_FIELD_BASE(75, 75, 4, 0x30, 0x10, 11, 1),
@@ -104,42 +134,61 @@ static const struct mtk_pin_field_calc mt7988_pin_ies_range[] = {
 	PIN_FIELD_BASE(77, 77, 4, 0x30, 0x10, 2, 1),
 	PIN_FIELD_BASE(78, 78, 4, 0x30, 0x10, 0, 1),
 	PIN_FIELD_BASE(79, 79, 4, 0x30, 0x10, 12, 1),
-	PIN_FIELD_BASE(80, 81, 1, 0x40, 0x10, 18, 1),
-	PIN_FIELD_BASE(82, 83, 1, 0x40, 0x10, 16, 1),
+
+	PIN_FIELD_BASE(80, 80, 1, 0x40, 0x10, 18, 1),
+	PIN_FIELD_BASE(81, 81, 1, 0x40, 0x10, 19, 1),
+	PIN_FIELD_BASE(82, 82, 1, 0x40, 0x10, 16, 1),
+	PIN_FIELD_BASE(83, 83, 1, 0x40, 0x10, 17, 1),
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_smt_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0xc0, 0x10, 13, 1),
-	PIN_FIELD_BASE(2, 3, 5, 0xc0, 0x10, 11, 1),
+	PIN_FIELD_BASE(0, 0, 5, 0xc0, 0x10, 13, 1),
+	PIN_FIELD_BASE(1, 1, 5, 0xc0, 0x10, 14, 1),
+	PIN_FIELD_BASE(2, 2, 5, 0xc0, 0x10, 11, 1),
+	PIN_FIELD_BASE(3, 3, 5, 0xc0, 0x10, 12, 1),
 	PIN_FIELD_BASE(4, 4, 5, 0xc0, 0x10, 0, 1),
-	PIN_FIELD_BASE(5, 6, 5, 0xc0, 0x10, 9, 1),
+	PIN_FIELD_BASE(5, 5, 5, 0xc0, 0x10, 9, 1),
+	PIN_FIELD_BASE(6, 6, 5, 0xc0, 0x10, 10, 1),
+
 	PIN_FIELD_BASE(7, 7, 4, 0xb0, 0x10, 8, 1),
 	PIN_FIELD_BASE(8, 8, 4, 0xb0, 0x10, 6, 1),
 	PIN_FIELD_BASE(9, 9, 4, 0xb0, 0x10, 5, 1),
 	PIN_FIELD_BASE(10, 10, 4, 0xb0, 0x10, 3, 1),
+
 	PIN_FIELD_BASE(11, 11, 1, 0xe0, 0x10, 0, 1),
 	PIN_FIELD_BASE(12, 12, 1, 0xe0, 0x10, 21, 1),
-	PIN_FIELD_BASE(13, 14, 1, 0xe0, 0x10, 1, 1),
-	PIN_FIELD_BASE(15, 16, 5, 0xc0, 0x10, 7, 1),
-	PIN_FIELD_BASE(17, 18, 5, 0xc0, 0x10, 3, 1),
+	PIN_FIELD_BASE(13, 13, 1, 0xe0, 0x10, 1, 1),
+	PIN_FIELD_BASE(14, 14, 1, 0xe0, 0x10, 2, 1),
+
+	PIN_FIELD_BASE(15, 15, 5, 0xc0, 0x10, 7, 1),
+	PIN_FIELD_BASE(16, 16, 5, 0xc0, 0x10, 8, 1),
+	PIN_FIELD_BASE(17, 17, 5, 0xc0, 0x10, 3, 1),
+	PIN_FIELD_BASE(18, 18, 5, 0xc0, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(19, 19, 4, 0xb0, 0x10, 7, 1),
 	PIN_FIELD_BASE(20, 20, 4, 0xb0, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(21, 21, 3, 0x140, 0x10, 17, 1),
 	PIN_FIELD_BASE(22, 22, 3, 0x140, 0x10, 23, 1),
 	PIN_FIELD_BASE(23, 23, 3, 0x140, 0x10, 20, 1),
 	PIN_FIELD_BASE(24, 24, 3, 0x140, 0x10, 19, 1),
-	PIN_FIELD_BASE(25, 26, 3, 0x140, 0x10, 21, 1),
+	PIN_FIELD_BASE(25, 25, 3, 0x140, 0x10, 21, 1),
+	PIN_FIELD_BASE(26, 26, 3, 0x140, 0x10, 22, 1),
 	PIN_FIELD_BASE(27, 27, 3, 0x140, 0x10, 18, 1),
-	PIN_FIELD_BASE(28, 30, 3, 0x140, 0x10, 25, 1),
+	PIN_FIELD_BASE(28, 28, 3, 0x140, 0x10, 25, 1),
+	PIN_FIELD_BASE(29, 29, 3, 0x140, 0x10, 26, 1),
+	PIN_FIELD_BASE(30, 30, 3, 0x140, 0x10, 27, 1),
 	PIN_FIELD_BASE(31, 31, 3, 0x140, 0x10, 24, 1),
 	PIN_FIELD_BASE(32, 32, 3, 0x140, 0x10, 28, 1),
 	PIN_FIELD_BASE(33, 33, 3, 0x150, 0x10, 0, 1),
 	PIN_FIELD_BASE(34, 34, 3, 0x140, 0x10, 31, 1),
-	PIN_FIELD_BASE(35, 36, 3, 0x140, 0x10, 29, 1),
+	PIN_FIELD_BASE(35, 35, 3, 0x140, 0x10, 29, 1),
+	PIN_FIELD_BASE(36, 36, 3, 0x140, 0x10, 30, 1),
 	PIN_FIELD_BASE(37, 37, 3, 0x150, 0x10, 1, 1),
 	PIN_FIELD_BASE(38, 38, 3, 0x140, 0x10, 11, 1),
 	PIN_FIELD_BASE(39, 39, 3, 0x140, 0x10, 10, 1),
-	PIN_FIELD_BASE(40, 41, 3, 0x140, 0x10, 0, 1),
+	PIN_FIELD_BASE(40, 40, 3, 0x140, 0x10, 0, 1),
+	PIN_FIELD_BASE(41, 41, 3, 0x140, 0x10, 1, 1),
 	PIN_FIELD_BASE(42, 42, 3, 0x140, 0x10, 9, 1),
 	PIN_FIELD_BASE(43, 43, 3, 0x140, 0x10, 8, 1),
 	PIN_FIELD_BASE(44, 44, 3, 0x140, 0x10, 7, 1),
@@ -149,17 +198,31 @@ static const struct mtk_pin_field_calc mt7988_pin_smt_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0x140, 0x10, 3, 1),
 	PIN_FIELD_BASE(49, 49, 3, 0x140, 0x10, 2, 1),
 	PIN_FIELD_BASE(50, 50, 3, 0x140, 0x10, 15, 1),
-	PIN_FIELD_BASE(51, 53, 3, 0x140, 0x10, 12, 1),
+	PIN_FIELD_BASE(51, 51, 3, 0x140, 0x10, 12, 1),
+	PIN_FIELD_BASE(52, 52, 3, 0x140, 0x10, 13, 1),
+	PIN_FIELD_BASE(53, 53, 3, 0x140, 0x10, 14, 1),
 	PIN_FIELD_BASE(54, 54, 3, 0x140, 0x10, 16, 1),
-	PIN_FIELD_BASE(55, 56, 1, 0xe0, 0x10, 14, 1),
+
+	PIN_FIELD_BASE(55, 55, 1, 0xe0, 0x10, 14, 1),
+	PIN_FIELD_BASE(56, 56, 1, 0xe0, 0x10, 15, 1),
 	PIN_FIELD_BASE(57, 57, 1, 0xe0, 0x10, 13, 1),
-	PIN_FIELD_BASE(58, 60, 1, 0xe0, 0x10, 4, 1),
+	PIN_FIELD_BASE(58, 58, 1, 0xe0, 0x10, 4, 1),
+	PIN_FIELD_BASE(59, 59, 1, 0xe0, 0x10, 5, 1),
+	PIN_FIELD_BASE(60, 60, 1, 0xe0, 0x10, 6, 1),
 	PIN_FIELD_BASE(61, 61, 1, 0xe0, 0x10, 3, 1),
 	PIN_FIELD_BASE(62, 62, 1, 0xe0, 0x10, 7, 1),
 	PIN_FIELD_BASE(63, 63, 1, 0xe0, 0x10, 20, 1),
-	PIN_FIELD_BASE(64, 68, 1, 0xe0, 0x10, 8, 1),
-	PIN_FIELD_BASE(69, 70, 5, 0xc0, 0x10, 1, 1),
-	PIN_FIELD_BASE(71, 72, 5, 0xc0, 0x10, 5, 1),
+	PIN_FIELD_BASE(64, 64, 1, 0xe0, 0x10, 8, 1),
+	PIN_FIELD_BASE(65, 65, 1, 0xe0, 0x10, 9, 1),
+	PIN_FIELD_BASE(66, 66, 1, 0xe0, 0x10, 10, 1),
+	PIN_FIELD_BASE(67, 67, 1, 0xe0, 0x10, 11, 1),
+	PIN_FIELD_BASE(68, 68, 1, 0xe0, 0x10, 12, 1),
+
+	PIN_FIELD_BASE(69, 69, 5, 0xc0, 0x10, 1, 1),
+	PIN_FIELD_BASE(70, 70, 5, 0xc0, 0x10, 2, 1),
+	PIN_FIELD_BASE(71, 71, 5, 0xc0, 0x10, 5, 1),
+	PIN_FIELD_BASE(72, 72, 5, 0xc0, 0x10, 6, 1),
+
 	PIN_FIELD_BASE(73, 73, 4, 0xb0, 0x10, 10, 1),
 	PIN_FIELD_BASE(74, 74, 4, 0xb0, 0x10, 1, 1),
 	PIN_FIELD_BASE(75, 75, 4, 0xb0, 0x10, 11, 1),
@@ -167,8 +230,11 @@ static const struct mtk_pin_field_calc mt7988_pin_smt_range[] = {
 	PIN_FIELD_BASE(77, 77, 4, 0xb0, 0x10, 2, 1),
 	PIN_FIELD_BASE(78, 78, 4, 0xb0, 0x10, 0, 1),
 	PIN_FIELD_BASE(79, 79, 4, 0xb0, 0x10, 12, 1),
-	PIN_FIELD_BASE(80, 81, 1, 0xe0, 0x10, 18, 1),
-	PIN_FIELD_BASE(82, 83, 1, 0xe0, 0x10, 16, 1),
+
+	PIN_FIELD_BASE(80, 80, 1, 0xe0, 0x10, 18, 1),
+	PIN_FIELD_BASE(81, 81, 1, 0xe0, 0x10, 19, 1),
+	PIN_FIELD_BASE(82, 82, 1, 0xe0, 0x10, 16, 1),
+	PIN_FIELD_BASE(83, 83, 1, 0xe0, 0x10, 17, 1),
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_pu_range[] = {
@@ -176,8 +242,11 @@ static const struct mtk_pin_field_calc mt7988_pin_pu_range[] = {
 	PIN_FIELD_BASE(8, 8, 4, 0x60, 0x10, 4, 1),
 	PIN_FIELD_BASE(9, 9, 4, 0x60, 0x10, 3, 1),
 	PIN_FIELD_BASE(10, 10, 4, 0x60, 0x10, 2, 1),
-	PIN_FIELD_BASE(13, 14, 1, 0x70, 0x10, 0, 1),
+
+	PIN_FIELD_BASE(13, 13, 1, 0x70, 0x10, 0, 1),
+	PIN_FIELD_BASE(14, 14, 1, 0x70, 0x10, 1, 1),
 	PIN_FIELD_BASE(63, 63, 1, 0x70, 0x10, 2, 1),
+
 	PIN_FIELD_BASE(75, 75, 4, 0x60, 0x10, 7, 1),
 	PIN_FIELD_BASE(76, 76, 4, 0x60, 0x10, 6, 1),
 	PIN_FIELD_BASE(77, 77, 4, 0x60, 0x10, 1, 1),
@@ -190,11 +259,19 @@ static const struct mtk_pin_field_calc mt7988_pin_pd_range[] = {
 	PIN_FIELD_BASE(8, 8, 4, 0x40, 0x10, 4, 1),
 	PIN_FIELD_BASE(9, 9, 4, 0x40, 0x10, 3, 1),
 	PIN_FIELD_BASE(10, 10, 4, 0x40, 0x10, 2, 1),
-	PIN_FIELD_BASE(13, 14, 1, 0x50, 0x10, 0, 1),
-	PIN_FIELD_BASE(15, 16, 5, 0x40, 0x10, 4, 1),
-	PIN_FIELD_BASE(17, 18, 5, 0x40, 0x10, 0, 1),
+
+	PIN_FIELD_BASE(13, 13, 1, 0x50, 0x10, 0, 1),
+	PIN_FIELD_BASE(14, 14, 1, 0x50, 0x10, 1, 1),
+
+	PIN_FIELD_BASE(15, 15, 5, 0x40, 0x10, 4, 1),
+	PIN_FIELD_BASE(16, 16, 5, 0x40, 0x10, 5, 1),
+	PIN_FIELD_BASE(17, 17, 5, 0x40, 0x10, 0, 1),
+	PIN_FIELD_BASE(18, 18, 5, 0x40, 0x10, 1, 1),
+
 	PIN_FIELD_BASE(63, 63, 1, 0x50, 0x10, 2, 1),
-	PIN_FIELD_BASE(71, 72, 5, 0x40, 0x10, 2, 1),
+	PIN_FIELD_BASE(71, 71, 5, 0x40, 0x10, 2, 1),
+	PIN_FIELD_BASE(72, 72, 5, 0x40, 0x10, 3, 1),
+
 	PIN_FIELD_BASE(75, 75, 4, 0x40, 0x10, 7, 1),
 	PIN_FIELD_BASE(76, 76, 4, 0x40, 0x10, 6, 1),
 	PIN_FIELD_BASE(77, 77, 4, 0x40, 0x10, 1, 1),
@@ -203,26 +280,37 @@ static const struct mtk_pin_field_calc mt7988_pin_pd_range[] = {
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_drv_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0x00, 0x10, 21, 3),
-	PIN_FIELD_BASE(2, 3, 5, 0x00, 0x10, 15, 3),
+	PIN_FIELD_BASE(0, 0, 5, 0x00, 0x10, 21, 3),
+	PIN_FIELD_BASE(1, 1, 5, 0x00, 0x10, 24, 3),
+	PIN_FIELD_BASE(2, 2, 5, 0x00, 0x10, 15, 3),
+	PIN_FIELD_BASE(3, 3, 5, 0x00, 0x10, 18, 3),
 	PIN_FIELD_BASE(4, 4, 5, 0x00, 0x10, 0, 3),
-	PIN_FIELD_BASE(5, 6, 5, 0x00, 0x10, 9, 3),
+	PIN_FIELD_BASE(5, 5, 5, 0x00, 0x10, 9, 3),
+	PIN_FIELD_BASE(6, 6, 5, 0x00, 0x10, 12, 3),
+
 	PIN_FIELD_BASE(7, 7, 4, 0x00, 0x10, 24, 3),
 	PIN_FIELD_BASE(8, 8, 4, 0x00, 0x10, 28, 3),
 	PIN_FIELD_BASE(9, 9, 4, 0x00, 0x10, 15, 3),
 	PIN_FIELD_BASE(10, 10, 4, 0x00, 0x10, 9, 3),
+
 	PIN_FIELD_BASE(11, 11, 1, 0x00, 0x10, 0, 3),
 	PIN_FIELD_BASE(12, 12, 1, 0x20, 0x10, 3, 3),
-	PIN_FIELD_BASE(13, 14, 1, 0x00, 0x10, 3, 3),
+	PIN_FIELD_BASE(13, 13, 1, 0x00, 0x10, 3, 3),
+	PIN_FIELD_BASE(14, 14, 1, 0x00, 0x10, 6, 3),
+
 	PIN_FIELD_BASE(19, 19, 4, 0x00, 0x10, 21, 3),
 	PIN_FIELD_BASE(20, 20, 4, 0x00, 0x10, 12, 3),
+
 	PIN_FIELD_BASE(21, 21, 3, 0x10, 0x10, 21, 3),
 	PIN_FIELD_BASE(22, 22, 3, 0x20, 0x10, 9, 3),
 	PIN_FIELD_BASE(23, 23, 3, 0x20, 0x10, 0, 3),
 	PIN_FIELD_BASE(24, 24, 3, 0x10, 0x10, 27, 3),
-	PIN_FIELD_BASE(25, 26, 3, 0x20, 0x10, 3, 3),
+	PIN_FIELD_BASE(25, 25, 3, 0x20, 0x10, 3, 3),
+	PIN_FIELD_BASE(26, 26, 3, 0x20, 0x10, 6, 3),
 	PIN_FIELD_BASE(27, 27, 3, 0x10, 0x10, 24, 3),
-	PIN_FIELD_BASE(28, 30, 3, 0x20, 0x10, 15, 3),
+	PIN_FIELD_BASE(28, 28, 3, 0x20, 0x10, 15, 3),
+	PIN_FIELD_BASE(29, 29, 3, 0x20, 0x10, 18, 3),
+	PIN_FIELD_BASE(30, 30, 3, 0x20, 0x10, 21, 3),
 	PIN_FIELD_BASE(31, 31, 3, 0x20, 0x10, 12, 3),
 	PIN_FIELD_BASE(32, 32, 3, 0x20, 0x10, 24, 3),
 	PIN_FIELD_BASE(33, 33, 3, 0x30, 0x10, 6, 3),
@@ -232,7 +320,8 @@ static const struct mtk_pin_field_calc mt7988_pin_drv_range[] = {
 	PIN_FIELD_BASE(37, 37, 3, 0x30, 0x10, 9, 3),
 	PIN_FIELD_BASE(38, 38, 3, 0x10, 0x10, 3, 3),
 	PIN_FIELD_BASE(39, 39, 3, 0x10, 0x10, 0, 3),
-	PIN_FIELD_BASE(40, 41, 3, 0x00, 0x10, 0, 3),
+	PIN_FIELD_BASE(40, 40, 3, 0x00, 0x10, 0, 3),
+	PIN_FIELD_BASE(41, 41, 3, 0x00, 0x10, 3, 3),
 	PIN_FIELD_BASE(42, 42, 3, 0x00, 0x10, 27, 3),
 	PIN_FIELD_BASE(43, 43, 3, 0x00, 0x10, 24, 3),
 	PIN_FIELD_BASE(44, 44, 3, 0x00, 0x10, 21, 3),
@@ -242,17 +331,29 @@ static const struct mtk_pin_field_calc mt7988_pin_drv_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0x00, 0x10, 9, 3),
 	PIN_FIELD_BASE(49, 49, 3, 0x00, 0x10, 6, 3),
 	PIN_FIELD_BASE(50, 50, 3, 0x10, 0x10, 15, 3),
-	PIN_FIELD_BASE(51, 53, 3, 0x10, 0x10, 6, 3),
+	PIN_FIELD_BASE(51, 51, 3, 0x10, 0x10, 6, 3),
+	PIN_FIELD_BASE(52, 52, 3, 0x10, 0x10, 9, 3),
+	PIN_FIELD_BASE(53, 53, 3, 0x10, 0x10, 12, 3),
 	PIN_FIELD_BASE(54, 54, 3, 0x10, 0x10, 18, 3),
-	PIN_FIELD_BASE(55, 56, 1, 0x10, 0x10, 12, 3),
+
+	PIN_FIELD_BASE(55, 55, 1, 0x10, 0x10, 12, 3),
+	PIN_FIELD_BASE(56, 56, 1, 0x10, 0x10, 15, 3),
 	PIN_FIELD_BASE(57, 57, 1, 0x10, 0x10, 9, 3),
-	PIN_FIELD_BASE(58, 60, 1, 0x00, 0x10, 12, 3),
+	PIN_FIELD_BASE(58, 58, 1, 0x00, 0x10, 12, 3),
+	PIN_FIELD_BASE(59, 59, 1, 0x00, 0x10, 15, 3),
+	PIN_FIELD_BASE(60, 60, 1, 0x00, 0x10, 18, 3),
 	PIN_FIELD_BASE(61, 61, 1, 0x00, 0x10, 9, 3),
 	PIN_FIELD_BASE(62, 62, 1, 0x00, 0x10, 21, 3),
 	PIN_FIELD_BASE(63, 63, 1, 0x20, 0x10, 0, 3),
-	PIN_FIELD_BASE(64, 65, 1, 0x00, 0x10, 24, 3),
-	PIN_FIELD_BASE(66, 68, 1, 0x10, 0x10, 0, 3),
-	PIN_FIELD_BASE(69, 70, 5, 0x00, 0x10, 3, 3),
+	PIN_FIELD_BASE(64, 64, 1, 0x00, 0x10, 24, 3),
+	PIN_FIELD_BASE(65, 65, 1, 0x00, 0x10, 27, 3),
+	PIN_FIELD_BASE(66, 66, 1, 0x10, 0x10, 0, 3),
+	PIN_FIELD_BASE(67, 67, 1, 0x10, 0x10, 3, 3),
+	PIN_FIELD_BASE(68, 68, 1, 0x10, 0x10, 6, 3),
+
+	PIN_FIELD_BASE(69, 69, 5, 0x00, 0x10, 3, 3),
+	PIN_FIELD_BASE(70, 70, 5, 0x00, 0x10, 6, 3),
+
 	PIN_FIELD_BASE(73, 73, 4, 0x10, 0x10, 0, 3),
 	PIN_FIELD_BASE(74, 74, 4, 0x00, 0x10, 3, 3),
 	PIN_FIELD_BASE(75, 75, 4, 0x10, 0x10, 3, 3),
@@ -260,35 +361,49 @@ static const struct mtk_pin_field_calc mt7988_pin_drv_range[] = {
 	PIN_FIELD_BASE(77, 77, 4, 0x00, 0x10, 6, 3),
 	PIN_FIELD_BASE(78, 78, 4, 0x00, 0x10, 0, 3),
 	PIN_FIELD_BASE(79, 79, 4, 0x10, 0x10, 6, 3),
-	PIN_FIELD_BASE(80, 81, 1, 0x10, 0x10, 24, 3),
-	PIN_FIELD_BASE(82, 83, 1, 0x10, 0x10, 18, 3),
+
+	PIN_FIELD_BASE(80, 80, 1, 0x10, 0x10, 24, 3),
+	PIN_FIELD_BASE(81, 81, 1, 0x10, 0x10, 27, 3),
+	PIN_FIELD_BASE(82, 82, 1, 0x10, 0x10, 18, 3),
+	PIN_FIELD_BASE(83, 83, 1, 0x10, 0x10, 21, 3),
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_pupd_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0x50, 0x10, 7, 1),
-	PIN_FIELD_BASE(2, 3, 5, 0x50, 0x10, 5, 1),
+	PIN_FIELD_BASE(0, 0, 5, 0x50, 0x10, 7, 1),
+	PIN_FIELD_BASE(1, 1, 5, 0x50, 0x10, 8, 1),
+	PIN_FIELD_BASE(2, 2, 5, 0x50, 0x10, 5, 1),
+	PIN_FIELD_BASE(3, 3, 5, 0x50, 0x10, 6, 1),
 	PIN_FIELD_BASE(4, 4, 5, 0x50, 0x10, 0, 1),
-	PIN_FIELD_BASE(5, 6, 5, 0x50, 0x10, 3, 1),
+	PIN_FIELD_BASE(5, 5, 5, 0x50, 0x10, 3, 1),
+	PIN_FIELD_BASE(6, 6, 5, 0x50, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(11, 11, 1, 0x60, 0x10, 0, 1),
 	PIN_FIELD_BASE(12, 12, 1, 0x60, 0x10, 18, 1),
+
 	PIN_FIELD_BASE(19, 19, 4, 0x50, 0x10, 2, 1),
 	PIN_FIELD_BASE(20, 20, 4, 0x50, 0x10, 1, 1),
+
 	PIN_FIELD_BASE(21, 21, 3, 0x70, 0x10, 17, 1),
 	PIN_FIELD_BASE(22, 22, 3, 0x70, 0x10, 23, 1),
 	PIN_FIELD_BASE(23, 23, 3, 0x70, 0x10, 20, 1),
 	PIN_FIELD_BASE(24, 24, 3, 0x70, 0x10, 19, 1),
-	PIN_FIELD_BASE(25, 26, 3, 0x70, 0x10, 21, 1),
+	PIN_FIELD_BASE(25, 25, 3, 0x70, 0x10, 21, 1),
+	PIN_FIELD_BASE(26, 26, 3, 0x70, 0x10, 22, 1),
 	PIN_FIELD_BASE(27, 27, 3, 0x70, 0x10, 18, 1),
-	PIN_FIELD_BASE(28, 30, 3, 0x70, 0x10, 25, 1),
+	PIN_FIELD_BASE(28, 28, 3, 0x70, 0x10, 25, 1),
+	PIN_FIELD_BASE(29, 29, 3, 0x70, 0x10, 26, 1),
+	PIN_FIELD_BASE(30, 30, 3, 0x70, 0x10, 27, 1),
 	PIN_FIELD_BASE(31, 31, 3, 0x70, 0x10, 24, 1),
 	PIN_FIELD_BASE(32, 32, 3, 0x70, 0x10, 28, 1),
 	PIN_FIELD_BASE(33, 33, 3, 0x80, 0x10, 0, 1),
 	PIN_FIELD_BASE(34, 34, 3, 0x70, 0x10, 31, 1),
-	PIN_FIELD_BASE(35, 36, 3, 0x70, 0x10, 29, 1),
+	PIN_FIELD_BASE(35, 35, 3, 0x70, 0x10, 29, 1),
+	PIN_FIELD_BASE(36, 36, 3, 0x70, 0x10, 30, 1),
 	PIN_FIELD_BASE(37, 37, 3, 0x80, 0x10, 1, 1),
 	PIN_FIELD_BASE(38, 38, 3, 0x70, 0x10, 11, 1),
 	PIN_FIELD_BASE(39, 39, 3, 0x70, 0x10, 10, 1),
-	PIN_FIELD_BASE(40, 41, 3, 0x70, 0x10, 0, 1),
+	PIN_FIELD_BASE(40, 40, 3, 0x70, 0x10, 0, 1),
+	PIN_FIELD_BASE(41, 41, 3, 0x70, 0x10, 1, 1),
 	PIN_FIELD_BASE(42, 42, 3, 0x70, 0x10, 9, 1),
 	PIN_FIELD_BASE(43, 43, 3, 0x70, 0x10, 8, 1),
 	PIN_FIELD_BASE(44, 44, 3, 0x70, 0x10, 7, 1),
@@ -298,46 +413,73 @@ static const struct mtk_pin_field_calc mt7988_pin_pupd_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0x70, 0x10, 3, 1),
 	PIN_FIELD_BASE(49, 49, 3, 0x70, 0x10, 2, 1),
 	PIN_FIELD_BASE(50, 50, 3, 0x70, 0x10, 15, 1),
-	PIN_FIELD_BASE(51, 53, 3, 0x70, 0x10, 12, 1),
+	PIN_FIELD_BASE(51, 51, 3, 0x70, 0x10, 12, 1),
+	PIN_FIELD_BASE(52, 52, 3, 0x70, 0x10, 13, 1),
+	PIN_FIELD_BASE(53, 53, 3, 0x70, 0x10, 14, 1),
 	PIN_FIELD_BASE(54, 54, 3, 0x70, 0x10, 16, 1),
-	PIN_FIELD_BASE(55, 56, 1, 0x60, 0x10, 12, 1),
+
+	PIN_FIELD_BASE(55, 55, 1, 0x60, 0x10, 12, 1),
+	PIN_FIELD_BASE(56, 56, 1, 0x60, 0x10, 13, 1),
 	PIN_FIELD_BASE(57, 57, 1, 0x60, 0x10, 11, 1),
-	PIN_FIELD_BASE(58, 60, 1, 0x60, 0x10, 2, 1),
+	PIN_FIELD_BASE(58, 58, 1, 0x60, 0x10, 2, 1),
+	PIN_FIELD_BASE(59, 59, 1, 0x60, 0x10, 3, 1),
+	PIN_FIELD_BASE(60, 60, 1, 0x60, 0x10, 4, 1),
 	PIN_FIELD_BASE(61, 61, 1, 0x60, 0x10, 1, 1),
 	PIN_FIELD_BASE(62, 62, 1, 0x60, 0x10, 5, 1),
-	PIN_FIELD_BASE(64, 68, 1, 0x60, 0x10, 6, 1),
-	PIN_FIELD_BASE(69, 70, 5, 0x50, 0x10, 1, 1),
+	PIN_FIELD_BASE(64, 64, 1, 0x60, 0x10, 6, 1),
+	PIN_FIELD_BASE(65, 65, 1, 0x60, 0x10, 7, 1),
+	PIN_FIELD_BASE(66, 66, 1, 0x60, 0x10, 8, 1),
+	PIN_FIELD_BASE(67, 67, 1, 0x60, 0x10, 9, 1),
+	PIN_FIELD_BASE(68, 68, 1, 0x60, 0x10, 10, 1),
+
+	PIN_FIELD_BASE(69, 69, 5, 0x50, 0x10, 1, 1),
+	PIN_FIELD_BASE(70, 70, 5, 0x50, 0x10, 2, 1),
+
 	PIN_FIELD_BASE(73, 73, 4, 0x50, 0x10, 3, 1),
 	PIN_FIELD_BASE(74, 74, 4, 0x50, 0x10, 0, 1),
-	PIN_FIELD_BASE(80, 81, 1, 0x60, 0x10, 16, 1),
-	PIN_FIELD_BASE(82, 83, 1, 0x60, 0x10, 14, 1),
+
+	PIN_FIELD_BASE(80, 80, 1, 0x60, 0x10, 16, 1),
+	PIN_FIELD_BASE(81, 81, 1, 0x60, 0x10, 17, 1),
+	PIN_FIELD_BASE(82, 82, 1, 0x60, 0x10, 14, 1),
+	PIN_FIELD_BASE(83, 83, 1, 0x60, 0x10, 15, 1),
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_r0_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0x60, 0x10, 7, 1),
-	PIN_FIELD_BASE(2, 3, 5, 0x60, 0x10, 5, 1),
+	PIN_FIELD_BASE(0, 0, 5, 0x60, 0x10, 7, 1),
+	PIN_FIELD_BASE(1, 1, 5, 0x60, 0x10, 8, 1),
+	PIN_FIELD_BASE(2, 2, 5, 0x60, 0x10, 5, 1),
+	PIN_FIELD_BASE(3, 3, 5, 0x60, 0x10, 6, 1),
 	PIN_FIELD_BASE(4, 4, 5, 0x60, 0x10, 0, 1),
-	PIN_FIELD_BASE(5, 6, 5, 0x60, 0x10, 3, 1),
+	PIN_FIELD_BASE(5, 5, 5, 0x60, 0x10, 3, 1),
+	PIN_FIELD_BASE(6, 6, 5, 0x60, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(11, 11, 1, 0x80, 0x10, 0, 1),
 	PIN_FIELD_BASE(12, 12, 1, 0x80, 0x10, 18, 1),
+
 	PIN_FIELD_BASE(19, 19, 4, 0x70, 0x10, 2, 1),
 	PIN_FIELD_BASE(20, 20, 4, 0x70, 0x10, 1, 1),
+
 	PIN_FIELD_BASE(21, 21, 3, 0x90, 0x10, 17, 1),
 	PIN_FIELD_BASE(22, 22, 3, 0x90, 0x10, 23, 1),
 	PIN_FIELD_BASE(23, 23, 3, 0x90, 0x10, 20, 1),
 	PIN_FIELD_BASE(24, 24, 3, 0x90, 0x10, 19, 1),
-	PIN_FIELD_BASE(25, 26, 3, 0x90, 0x10, 21, 1),
+	PIN_FIELD_BASE(25, 25, 3, 0x90, 0x10, 21, 1),
+	PIN_FIELD_BASE(26, 26, 3, 0x90, 0x10, 22, 1),
 	PIN_FIELD_BASE(27, 27, 3, 0x90, 0x10, 18, 1),
-	PIN_FIELD_BASE(28, 30, 3, 0x90, 0x10, 25, 1),
+	PIN_FIELD_BASE(28, 28, 3, 0x90, 0x10, 25, 1),
+	PIN_FIELD_BASE(29, 29, 3, 0x90, 0x10, 26, 1),
+	PIN_FIELD_BASE(30, 30, 3, 0x90, 0x10, 27, 1),
 	PIN_FIELD_BASE(31, 31, 3, 0x90, 0x10, 24, 1),
 	PIN_FIELD_BASE(32, 32, 3, 0x90, 0x10, 28, 1),
 	PIN_FIELD_BASE(33, 33, 3, 0xa0, 0x10, 0, 1),
 	PIN_FIELD_BASE(34, 34, 3, 0x90, 0x10, 31, 1),
-	PIN_FIELD_BASE(35, 36, 3, 0x90, 0x10, 29, 1),
+	PIN_FIELD_BASE(35, 35, 3, 0x90, 0x10, 29, 1),
+	PIN_FIELD_BASE(36, 36, 3, 0x90, 0x10, 30, 1),
 	PIN_FIELD_BASE(37, 37, 3, 0xa0, 0x10, 1, 1),
 	PIN_FIELD_BASE(38, 38, 3, 0x90, 0x10, 11, 1),
 	PIN_FIELD_BASE(39, 39, 3, 0x90, 0x10, 10, 1),
-	PIN_FIELD_BASE(40, 41, 3, 0x90, 0x10, 0, 1),
+	PIN_FIELD_BASE(40, 40, 3, 0x90, 0x10, 0, 1),
+	PIN_FIELD_BASE(41, 41, 3, 0x90, 0x10, 1, 1),
 	PIN_FIELD_BASE(42, 42, 3, 0x90, 0x10, 9, 1),
 	PIN_FIELD_BASE(43, 43, 3, 0x90, 0x10, 8, 1),
 	PIN_FIELD_BASE(44, 44, 3, 0x90, 0x10, 7, 1),
@@ -347,46 +489,73 @@ static const struct mtk_pin_field_calc mt7988_pin_r0_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0x90, 0x10, 3, 1),
 	PIN_FIELD_BASE(49, 49, 3, 0x90, 0x10, 2, 1),
 	PIN_FIELD_BASE(50, 50, 3, 0x90, 0x10, 15, 1),
-	PIN_FIELD_BASE(51, 53, 3, 0x90, 0x10, 12, 1),
+	PIN_FIELD_BASE(51, 51, 3, 0x90, 0x10, 12, 1),
+	PIN_FIELD_BASE(52, 52, 3, 0x90, 0x10, 13, 1),
+	PIN_FIELD_BASE(53, 53, 3, 0x90, 0x10, 14, 1),
 	PIN_FIELD_BASE(54, 54, 3, 0x90, 0x10, 16, 1),
-	PIN_FIELD_BASE(55, 56, 1, 0x80, 0x10, 12, 1),
+
+	PIN_FIELD_BASE(55, 55, 1, 0x80, 0x10, 12, 1),
+	PIN_FIELD_BASE(56, 56, 1, 0x80, 0x10, 13, 1),
 	PIN_FIELD_BASE(57, 57, 1, 0x80, 0x10, 11, 1),
-	PIN_FIELD_BASE(58, 60, 1, 0x80, 0x10, 2, 1),
+	PIN_FIELD_BASE(58, 58, 1, 0x80, 0x10, 2, 1),
+	PIN_FIELD_BASE(59, 59, 1, 0x80, 0x10, 3, 1),
+	PIN_FIELD_BASE(60, 60, 1, 0x80, 0x10, 4, 1),
 	PIN_FIELD_BASE(61, 61, 1, 0x80, 0x10, 1, 1),
 	PIN_FIELD_BASE(62, 62, 1, 0x80, 0x10, 5, 1),
-	PIN_FIELD_BASE(64, 68, 1, 0x80, 0x10, 6, 1),
-	PIN_FIELD_BASE(69, 70, 5, 0x60, 0x10, 1, 1),
+	PIN_FIELD_BASE(64, 64, 1, 0x80, 0x10, 6, 1),
+	PIN_FIELD_BASE(65, 65, 1, 0x80, 0x10, 7, 1),
+	PIN_FIELD_BASE(66, 66, 1, 0x80, 0x10, 8, 1),
+	PIN_FIELD_BASE(67, 67, 1, 0x80, 0x10, 9, 1),
+	PIN_FIELD_BASE(68, 68, 1, 0x80, 0x10, 10, 1),
+
+	PIN_FIELD_BASE(69, 69, 5, 0x60, 0x10, 1, 1),
+	PIN_FIELD_BASE(70, 70, 5, 0x60, 0x10, 2, 1),
+
 	PIN_FIELD_BASE(73, 73, 4, 0x70, 0x10, 3, 1),
 	PIN_FIELD_BASE(74, 74, 4, 0x70, 0x10, 0, 1),
-	PIN_FIELD_BASE(80, 81, 1, 0x80, 0x10, 16, 1),
-	PIN_FIELD_BASE(82, 83, 1, 0x80, 0x10, 14, 1),
+
+	PIN_FIELD_BASE(80, 80, 1, 0x80, 0x10, 16, 1),
+	PIN_FIELD_BASE(81, 81, 1, 0x80, 0x10, 17, 1),
+	PIN_FIELD_BASE(82, 82, 1, 0x80, 0x10, 14, 1),
+	PIN_FIELD_BASE(83, 83, 1, 0x80, 0x10, 15, 1),
 };
 
 static const struct mtk_pin_field_calc mt7988_pin_r1_range[] = {
-	PIN_FIELD_BASE(0, 1, 5, 0x70, 0x10, 7, 1),
-	PIN_FIELD_BASE(2, 3, 5, 0x70, 0x10, 5, 1),
+	PIN_FIELD_BASE(0, 0, 5, 0x70, 0x10, 7, 1),
+	PIN_FIELD_BASE(1, 1, 5, 0x70, 0x10, 8, 1),
+	PIN_FIELD_BASE(2, 2, 5, 0x70, 0x10, 5, 1),
+	PIN_FIELD_BASE(3, 3, 5, 0x70, 0x10, 6, 1),
 	PIN_FIELD_BASE(4, 4, 5, 0x70, 0x10, 0, 1),
-	PIN_FIELD_BASE(5, 6, 5, 0x70, 0x10, 3, 1),
+	PIN_FIELD_BASE(5, 5, 5, 0x70, 0x10, 3, 1),
+	PIN_FIELD_BASE(6, 6, 5, 0x70, 0x10, 4, 1),
+
 	PIN_FIELD_BASE(11, 11, 1, 0x90, 0x10, 0, 1),
 	PIN_FIELD_BASE(12, 12, 1, 0x90, 0x10, 18, 1),
+
 	PIN_FIELD_BASE(19, 19, 4, 0x80, 0x10, 2, 1),
 	PIN_FIELD_BASE(20, 20, 4, 0x80, 0x10, 1, 1),
+
 	PIN_FIELD_BASE(21, 21, 3, 0xb0, 0x10, 17, 1),
 	PIN_FIELD_BASE(22, 22, 3, 0xb0, 0x10, 23, 1),
 	PIN_FIELD_BASE(23, 23, 3, 0xb0, 0x10, 20, 1),
 	PIN_FIELD_BASE(24, 24, 3, 0xb0, 0x10, 19, 1),
-	PIN_FIELD_BASE(25, 26, 3, 0xb0, 0x10, 21, 1),
+	PIN_FIELD_BASE(25, 25, 3, 0xb0, 0x10, 21, 1),
+	PIN_FIELD_BASE(26, 26, 3, 0xb0, 0x10, 22, 1),
 	PIN_FIELD_BASE(27, 27, 3, 0xb0, 0x10, 18, 1),
-	PIN_FIELD_BASE(28, 30, 3, 0xb0, 0x10, 25, 1),
+	PIN_FIELD_BASE(28, 28, 3, 0xb0, 0x10, 25, 1),
+	PIN_FIELD_BASE(29, 29, 3, 0xb0, 0x10, 26, 1),
+	PIN_FIELD_BASE(30, 30, 3, 0xb0, 0x10, 27, 1),
 	PIN_FIELD_BASE(31, 31, 3, 0xb0, 0x10, 24, 1),
 	PIN_FIELD_BASE(32, 32, 3, 0xb0, 0x10, 28, 1),
 	PIN_FIELD_BASE(33, 33, 3, 0xc0, 0x10, 0, 1),
 	PIN_FIELD_BASE(34, 34, 3, 0xb0, 0x10, 31, 1),
-	PIN_FIELD_BASE(35, 36, 3, 0xb0, 0x10, 29, 1),
+	PIN_FIELD_BASE(35, 35, 3, 0xb0, 0x10, 29, 1),
+	PIN_FIELD_BASE(36, 36, 3, 0xb0, 0x10, 30, 1),
 	PIN_FIELD_BASE(37, 37, 3, 0xc0, 0x10, 1, 1),
 	PIN_FIELD_BASE(38, 38, 3, 0xb0, 0x10, 11, 1),
 	PIN_FIELD_BASE(39, 39, 3, 0xb0, 0x10, 10, 1),
-	PIN_FIELD_BASE(40, 41, 3, 0xb0, 0x10, 0, 1),
+	PIN_FIELD_BASE(40, 40, 3, 0xb0, 0x10, 0, 1),
+	PIN_FIELD_BASE(41, 41, 3, 0xb0, 0x10, 1, 1),
 	PIN_FIELD_BASE(42, 42, 3, 0xb0, 0x10, 9, 1),
 	PIN_FIELD_BASE(43, 43, 3, 0xb0, 0x10, 8, 1),
 	PIN_FIELD_BASE(44, 44, 3, 0xb0, 0x10, 7, 1),
@@ -396,19 +565,35 @@ static const struct mtk_pin_field_calc mt7988_pin_r1_range[] = {
 	PIN_FIELD_BASE(48, 48, 3, 0xb0, 0x10, 3, 1),
 	PIN_FIELD_BASE(49, 49, 3, 0xb0, 0x10, 2, 1),
 	PIN_FIELD_BASE(50, 50, 3, 0xb0, 0x10, 15, 1),
-	PIN_FIELD_BASE(51, 53, 3, 0xb0, 0x10, 12, 1),
+	PIN_FIELD_BASE(51, 51, 3, 0xb0, 0x10, 12, 1),
+	PIN_FIELD_BASE(52, 52, 3, 0xb0, 0x10, 13, 1),
+	PIN_FIELD_BASE(53, 53, 3, 0xb0, 0x10, 14, 1),
 	PIN_FIELD_BASE(54, 54, 3, 0xb0, 0x10, 16, 1),
-	PIN_FIELD_BASE(55, 56, 1, 0x90, 0x10, 12, 1),
+
+	PIN_FIELD_BASE(55, 55, 1, 0x90, 0x10, 12, 1),
+	PIN_FIELD_BASE(56, 56, 1, 0x90, 0x10, 13, 1),
 	PIN_FIELD_BASE(57, 57, 1, 0x90, 0x10, 11, 1),
-	PIN_FIELD_BASE(58, 60, 1, 0x90, 0x10, 2, 1),
+	PIN_FIELD_BASE(58, 58, 1, 0x90, 0x10, 2, 1),
+	PIN_FIELD_BASE(59, 59, 1, 0x90, 0x10, 3, 1),
+	PIN_FIELD_BASE(60, 60, 1, 0x90, 0x10, 4, 1),
 	PIN_FIELD_BASE(61, 61, 1, 0x90, 0x10, 1, 1),
 	PIN_FIELD_BASE(62, 62, 1, 0x90, 0x10, 5, 1),
-	PIN_FIELD_BASE(64, 68, 1, 0x90, 0x10, 6, 1),
-	PIN_FIELD_BASE(69, 70, 5, 0x70, 0x10, 1, 1),
+	PIN_FIELD_BASE(64, 64, 1, 0x90, 0x10, 6, 1),
+	PIN_FIELD_BASE(65, 65, 1, 0x90, 0x10, 7, 1),
+	PIN_FIELD_BASE(66, 66, 1, 0x90, 0x10, 8, 1),
+	PIN_FIELD_BASE(67, 67, 1, 0x90, 0x10, 9, 1),
+	PIN_FIELD_BASE(68, 68, 1, 0x90, 0x10, 10, 1),
+
+	PIN_FIELD_BASE(69, 69, 5, 0x70, 0x10, 1, 1),
+	PIN_FIELD_BASE(70, 70, 5, 0x70, 0x10, 2, 1),
+
 	PIN_FIELD_BASE(73, 73, 4, 0x80, 0x10, 3, 1),
 	PIN_FIELD_BASE(74, 74, 4, 0x80, 0x10, 0, 1),
-	PIN_FIELD_BASE(80, 81, 1, 0x90, 0x10, 16, 1),
-	PIN_FIELD_BASE(82, 83, 1, 0x90, 0x10, 14, 1),
+
+	PIN_FIELD_BASE(80, 80, 1, 0x90, 0x10, 16, 1),
+	PIN_FIELD_BASE(81, 81, 1, 0x90, 0x10, 17, 1),
+	PIN_FIELD_BASE(82, 82, 1, 0x90, 0x10, 14, 1),
+	PIN_FIELD_BASE(83, 83, 1, 0x90, 0x10, 15, 1),
 };
 
 static const struct mtk_pin_reg_calc mt7988_reg_cals[] = {
@@ -1279,4 +1464,3 @@ static int __init mt7988_pinctrl_init(void)
 	return platform_driver_register(&mt7988_pinctrl_driver);
 }
 arch_initcall(mt7988_pinctrl_init);
-
diff --git a/lede/target/linux/rockchip/patches-6.6/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch b/lede/target/linux/rockchip/patches-6.6/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch
index 6667b33e54..9ba369d800 100644
--- a/lede/target/linux/rockchip/patches-6.6/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch
+++ b/lede/target/linux/rockchip/patches-6.6/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch
@@ -31,7 +31,7 @@ Signed-off-by: wevsty <ty@wevs.org>
  		reg = <0x0 0xff100000 0x0 0x1000>;
 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-@@ -2106,6 +2106,16 @@
+@@ -2114,6 +2114,16 @@
  		};
  	};
  
diff --git a/lede/target/linux/rockchip/patches-6.6/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch b/lede/target/linux/rockchip/patches-6.6/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch
index 86d046133b..831c09da57 100644
--- a/lede/target/linux/rockchip/patches-6.6/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch
+++ b/lede/target/linux/rockchip/patches-6.6/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch
@@ -11,7 +11,7 @@ Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1025,6 +1025,13 @@
+@@ -1034,6 +1034,13 @@
  		status = "disabled";
  	};
  
diff --git a/lede/target/linux/x86/config-6.6 b/lede/target/linux/x86/config-6.6
index 03a64848e8..6b8876e8bf 100644
--- a/lede/target/linux/x86/config-6.6
+++ b/lede/target/linux/x86/config-6.6
@@ -203,8 +203,6 @@ CONFIG_HWMON=y
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HYPERVISOR_GUEST is not set
-CONFIG_HZ_PERIODIC=y
 CONFIG_HYPERV=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_HYPERV_BALLOON=y
@@ -214,9 +212,8 @@ CONFIG_HYPERV_STORAGE=y
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYPERV_TIMER=y
 CONFIG_HYPERV_UTILS=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-CONFIG_PTP_1588_CLOCK=y
 # CONFIG_HYPERV_VSOCKETS is not set
+CONFIG_HZ_PERIODIC=y
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_AMD_MP2 is not set
@@ -323,10 +320,9 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NET_EGRESS=y
 CONFIG_NET_INGRESS=y
 # CONFIG_NET_NS is not set
-CONFIG_NET_XGRESS=y
-CONFIG_NLS=y
 CONFIG_NET_VENDOR_DAVICOM=y
 CONFIG_NET_VENDOR_FUNGIBLE=y
+CONFIG_NET_XGRESS=y
 CONFIG_NLS=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_NR_CPUS=1
@@ -408,6 +404,8 @@ CONFIG_PREEMPT_RCU=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_PID_ARCH_STATUS=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
 CONFIG_RANDOMIZE_KSTACK_OFFSET=y
 CONFIG_RANDSTRUCT_NONE=y
diff --git a/openwrt-packages/luci-app-filebrowser/Makefile b/openwrt-packages/luci-app-filebrowser/Makefile
index b25acc248c..0b20e6aec1 100644
--- a/openwrt-packages/luci-app-filebrowser/Makefile
+++ b/openwrt-packages/luci-app-filebrowser/Makefile
@@ -1,12 +1,14 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (C) 2023 ImmortalWrt.org
+# This is free software, licensed under the Apache License, Version 2.0 .
 
 include $(TOPDIR)/rules.mk
 
-LUCI_TITLE:=LuCI app for FileBrowser
-LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+filebrowser
+LUCI_TITLE:=LuCI File Browser module
+LUCI_DEPENDS:=+luci-base
+
+PKG_LICENSE:=Apache-2.0
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=1
+PKG_MAINTAINER:=Sergey Ponomarev <stokito@gmail.com>
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/openwrt-packages/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js b/openwrt-packages/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js
deleted file mode 100644
index b91e6c589f..0000000000
--- a/openwrt-packages/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js
+++ /dev/null
@@ -1,87 +0,0 @@
-'use strict';
-'require form';
-'require poll';
-'require rpc';
-'require uci';
-'require view';
-
-var callServiceList = rpc.declare({
-	object: 'service',
-	method: 'list',
-	params: ['name'],
-	expect: { '': {} }
-});
-
-function getServiceStatus() {
-	return L.resolveDefault(callServiceList('filebrowser'), {}).then(function (res) {
-		var isRunning = false;
-		try {
-			isRunning = res['filebrowser']['instances']['instance1']['running'];
-		} catch (e) { }
-		return isRunning;
-	});
-}
-
-function renderStatus(isRunning, port) {
-	var spanTemp = '<span style="color:%s"><strong>%s %s</strong></span>';
-	var renderHTML;
-	if (isRunning) {
-		var button = String.format('&#160;<a class="btn cbi-button" href="http://%s:%s" target="_blank" rel="noreferrer noopener">%s</a>',
-			window.location.hostname, port, _('Open Web Interface'));
-		renderHTML = spanTemp.format('green', _('FileBrowser'), _('RUNNING')) + button;
-	} else {
-		renderHTML = spanTemp.format('red', _('FileBrowser'), _('NOT RUNNING'));
-	}
-
-	return renderHTML;
-}
-
-return view.extend({
-	load: function() {
-		return uci.load('filebrowser');
-	},
-
-	render: function(data) {
-		var m, s, o;
-		var webport = (uci.get(data, 'config', 'listen_port') || '8989');
-
-		m = new form.Map('filebrowser', _('FileBrowser'),
-			_('FileBrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files..'));
-
-		s = m.section(form.TypedSection);
-		s.anonymous = true;
-		s.render = function () {
-			poll.add(function () {
-				return L.resolveDefault(getServiceStatus()).then(function (res) {
-					var view = document.getElementById('service_status');
-					view.innerHTML = renderStatus(res, webport);
-				});
-			});
-
-			return E('div', { class: 'cbi-section', id: 'status_bar' }, [
-					E('p', { id: 'service_status' }, _('Collecting data...'))
-			]);
-		}
-
-		s = m.section(form.NamedSection, 'config', 'filebrowser');
-
-		o = s.option(form.Flag, 'enabled', _('Enable'));
-		o.default = o.disabled;
-		o.rmempty = false;
-
-		o = s.option(form.Value, 'listen_port', _('Listen port'));
-		o.datatype = 'port';
-		o.default = '8989';
-		o.rmempty = false;
-
-		o = s.option(form.Value, 'root_path', _('Root directory'));
-		o.default = '/mnt';
-		o.rmempty = false;
-
-		o = s.option(form.Flag, 'disable_exec', _('Disable Command Runner feature'));
-		o.default = o.enabled;
-		o.rmempty = false;
-
-		return m.render();
-	}
-});
diff --git a/openwrt-packages/luci-app-filebrowser/htdocs/luci-static/resources/view/system/filebrowser.js b/openwrt-packages/luci-app-filebrowser/htdocs/luci-static/resources/view/system/filebrowser.js
new file mode 100644
index 0000000000..33fe2614e8
--- /dev/null
+++ b/openwrt-packages/luci-app-filebrowser/htdocs/luci-static/resources/view/system/filebrowser.js
@@ -0,0 +1,34 @@
+'use strict';
+'require view';
+'require ui';
+'require form';
+
+var formData = {
+	files: {
+		root: null,
+	}
+};
+
+return view.extend({
+	render: function() {
+		var m, s, o;
+
+		m = new form.JSONMap(formData, _('File Browser'), '');
+
+		s = m.section(form.NamedSection, 'files', 'files');
+
+		o = s.option(form.FileUpload, 'root', '');
+		o.root_directory = '/';
+		o.browser = true;
+		o.show_hidden = true;
+		o.enable_upload = true;
+		o.enable_remove = true;
+		o.enable_download = true;
+
+		return m.render();
+	},
+
+	handleSave: null,
+	handleSaveApply: null,
+	handleReset: null
+})
diff --git a/openwrt-packages/luci-app-filebrowser/po/templates/filebrowser.pot b/openwrt-packages/luci-app-filebrowser/po/templates/filebrowser.pot
index dcec5fbaab..9970b2c8ff 100644
--- a/openwrt-packages/luci-app-filebrowser/po/templates/filebrowser.pot
+++ b/openwrt-packages/luci-app-filebrowser/po/templates/filebrowser.pot
@@ -1,51 +1,11 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:62
-msgid "Collecting data..."
-msgstr ""
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:81
-msgid "Disable Command Runner feature"
-msgstr ""
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:68
-msgid "Enable"
-msgstr ""
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:31
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:33
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:48
+#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/system/filebrowser.js:16
 #: applications/luci-app-filebrowser/root/usr/share/luci/menu.d/luci-app-filebrowser.json:3
-msgid "FileBrowser"
-msgstr ""
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:49
-msgid ""
-"FileBrowser provides a file managing interface within a specified directory "
-"and it can be used to upload, delete, preview, rename and edit your files.."
+msgid "File Browser"
 msgstr ""
 
 #: applications/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json:3
-msgid "Grant UCI access for luci-app-filebrowser"
-msgstr ""
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:72
-msgid "Listen port"
-msgstr ""
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:33
-msgid "NOT RUNNING"
-msgstr ""
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:30
-msgid "Open Web Interface"
-msgstr ""
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:31
-msgid "RUNNING"
-msgstr ""
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:77
-msgid "Root directory"
+msgid "Grant access to File Browser"
 msgstr ""
diff --git a/openwrt-packages/luci-app-filebrowser/po/zh-cn b/openwrt-packages/luci-app-filebrowser/po/zh-cn
deleted file mode 120000
index 8d69574ddd..0000000000
--- a/openwrt-packages/luci-app-filebrowser/po/zh-cn
+++ /dev/null
@@ -1 +0,0 @@
-zh_Hans
\ No newline at end of file
diff --git a/openwrt-packages/luci-app-filebrowser/po/zh_Hans/filebrowser.po b/openwrt-packages/luci-app-filebrowser/po/zh_Hans/filebrowser.po
deleted file mode 100644
index b1b763dfd4..0000000000
--- a/openwrt-packages/luci-app-filebrowser/po/zh_Hans/filebrowser.po
+++ /dev/null
@@ -1,60 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: zh-Hans\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:62
-msgid "Collecting data..."
-msgstr "收集数据中..."
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:81
-msgid "Disable Command Runner feature"
-msgstr "禁用命令执行功能"
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:68
-msgid "Enable"
-msgstr "启用"
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:31
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:33
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:48
-#: applications/luci-app-filebrowser/root/usr/share/luci/menu.d/luci-app-filebrowser.json:3
-msgid "FileBrowser"
-msgstr "FileBrowser"
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:49
-msgid ""
-"FileBrowser provides a file managing interface within a specified directory "
-"and it can be used to upload, delete, preview, rename and edit your files.."
-msgstr ""
-"FileBrowser 提供指定目录下的文件管理界面，可用于上传、删除、预览、重命名和编"
-"辑文件。"
-
-#: applications/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json:3
-msgid "Grant UCI access for luci-app-filebrowser"
-msgstr "授予 luci-app-filebrowser 访问 UCI 配置的权限"
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:72
-msgid "Listen port"
-msgstr "监听端口"
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:33
-msgid "NOT RUNNING"
-msgstr "未运行"
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:30
-msgid "Open Web Interface"
-msgstr "打开 Web 界面"
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:31
-msgid "RUNNING"
-msgstr "运行中"
-
-#: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/filebrowser.js:77
-msgid "Root directory"
-msgstr "根目录"
diff --git a/openwrt-packages/luci-app-filebrowser/root/usr/share/luci/menu.d/luci-app-filebrowser.json b/openwrt-packages/luci-app-filebrowser/root/usr/share/luci/menu.d/luci-app-filebrowser.json
index 9bd0e410e4..506706957c 100644
--- a/openwrt-packages/luci-app-filebrowser/root/usr/share/luci/menu.d/luci-app-filebrowser.json
+++ b/openwrt-packages/luci-app-filebrowser/root/usr/share/luci/menu.d/luci-app-filebrowser.json
@@ -1,14 +1,13 @@
 {
-	"admin/services/filebrowser": {
-		"title": "FileBrowser",
+	"admin/system/filebrowser": {
+		"title": "File Browser",
+		"order": 80,
 		"action": {
-			"order": 30,
 			"type": "view",
-			"path": "filebrowser"
+			"path": "system/filebrowser"
 		},
 		"depends": {
-			"acl": [ "luci-app-filebrowser" ],
-			"uci": { "filebrowser": true }
+			"acl": [ "luci-app-filebrowser" ]
 		}
 	}
 }
diff --git a/openwrt-packages/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json b/openwrt-packages/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json
index cc5b6b0b6c..858a8dd70d 100644
--- a/openwrt-packages/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json
+++ b/openwrt-packages/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json
@@ -1,14 +1,14 @@
 {
 	"luci-app-filebrowser": {
-		"description": "Grant UCI access for luci-app-filebrowser",
-		"read": {
-			"ubus": {
-				"service": [ "list" ]
-			},
-			"uci": [ "filebrowser" ]
-		},
+		"description": "Grant access to File Browser",
 		"write": {
-			"uci": [ "filebrowser" ]
+			"cgi-io": [ "upload", "download" ],
+			"ubus": {
+				"file": [ "*" ]
+			},
+			"file": {
+				"/*": [  "list", "read", "write" ]
+			}
 		}
 	}
 }
diff --git a/ryujinx/src/Ryujinx.Common/Memory/SpanOrArray.cs b/ryujinx/src/Ryujinx.Common/Memory/SpanOrArray.cs
deleted file mode 100644
index 269ac02fd6..0000000000
--- a/ryujinx/src/Ryujinx.Common/Memory/SpanOrArray.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-
-namespace Ryujinx.Common.Memory
-{
-    /// <summary>
-    /// A struct that can represent both a Span and Array.
-    /// This is useful to keep the Array representation when possible to avoid copies.
-    /// </summary>
-    /// <typeparam name="T">Element Type</typeparam>
-    public readonly ref struct SpanOrArray<T> where T : unmanaged
-    {
-        public readonly T[] Array;
-        public readonly ReadOnlySpan<T> Span;
-
-        /// <summary>
-        /// Create a new SpanOrArray from an array.
-        /// </summary>
-        /// <param name="array">Array to store</param>
-        public SpanOrArray(T[] array)
-        {
-            Array = array;
-            Span = ReadOnlySpan<T>.Empty;
-        }
-
-        /// <summary>
-        /// Create a new SpanOrArray from a readonly span.
-        /// </summary>
-        /// <param name="array">Span to store</param>
-        public SpanOrArray(ReadOnlySpan<T> span)
-        {
-            Array = null;
-            Span = span;
-        }
-
-        /// <summary>
-        /// Return the contained array, or convert the span if necessary.
-        /// </summary>
-        /// <returns>An array containing the data</returns>
-        public T[] ToArray()
-        {
-            return Array ?? Span.ToArray();
-        }
-
-        /// <summary>
-        /// Return a ReadOnlySpan from either the array or ReadOnlySpan.
-        /// </summary>
-        /// <returns>A ReadOnlySpan containing the data</returns>
-        public ReadOnlySpan<T> AsSpan()
-        {
-            return Array ?? Span;
-        }
-
-        /// <summary>
-        /// Cast an array to a SpanOrArray.
-        /// </summary>
-        /// <param name="array">Source array</param>
-        public static implicit operator SpanOrArray<T>(T[] array)
-        {
-            return new SpanOrArray<T>(array);
-        }
-
-        /// <summary>
-        /// Cast a ReadOnlySpan to a SpanOrArray.
-        /// </summary>
-        /// <param name="span">Source ReadOnlySpan</param>
-        public static implicit operator SpanOrArray<T>(ReadOnlySpan<T> span)
-        {
-            return new SpanOrArray<T>(span);
-        }
-
-        /// <summary>
-        /// Cast a Span to a SpanOrArray.
-        /// </summary>
-        /// <param name="span">Source Span</param>
-        public static implicit operator SpanOrArray<T>(Span<T> span)
-        {
-            return new SpanOrArray<T>(span);
-        }
-
-        /// <summary>
-        /// Cast a SpanOrArray to a ReadOnlySpan
-        /// </summary>
-        /// <param name="spanOrArray">Source SpanOrArray</param>
-        public static implicit operator ReadOnlySpan<T>(SpanOrArray<T> spanOrArray)
-        {
-            return spanOrArray.AsSpan();
-        }
-    }
-}
diff --git a/ryujinx/src/Ryujinx.Common/Utilities/EmbeddedResources.cs b/ryujinx/src/Ryujinx.Common/Utilities/EmbeddedResources.cs
index a4facc2e37..e22571c966 100644
--- a/ryujinx/src/Ryujinx.Common/Utilities/EmbeddedResources.cs
+++ b/ryujinx/src/Ryujinx.Common/Utilities/EmbeddedResources.cs
@@ -1,5 +1,6 @@
 using Ryujinx.Common.Utilities;
 using System;
+using System.Buffers;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -41,6 +42,22 @@ namespace Ryujinx.Common
             return StreamUtils.StreamToBytes(stream);
         }
 
+        public static IMemoryOwner<byte> ReadFileToRentedMemory(string filename)
+        {
+            var (assembly, path) = ResolveManifestPath(filename);
+
+            return ReadFileToRentedMemory(assembly, path);
+        }
+
+        public static IMemoryOwner<byte> ReadFileToRentedMemory(Assembly assembly, string filename)
+        {
+            using var stream = GetStream(assembly, filename);
+
+            return stream is null
+                ? null
+                : StreamUtils.StreamToRentedMemory(stream);
+        }
+
         public async static Task<byte[]> ReadAsync(Assembly assembly, string filename)
         {
             using var stream = GetStream(assembly, filename);
diff --git a/ryujinx/src/Ryujinx.Common/Utilities/StreamUtils.cs b/ryujinx/src/Ryujinx.Common/Utilities/StreamUtils.cs
index 7a20c98e95..74b6af5ecf 100644
--- a/ryujinx/src/Ryujinx.Common/Utilities/StreamUtils.cs
+++ b/ryujinx/src/Ryujinx.Common/Utilities/StreamUtils.cs
@@ -1,4 +1,6 @@
+using Microsoft.IO;
 using Ryujinx.Common.Memory;
+using System.Buffers;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -9,12 +11,50 @@ namespace Ryujinx.Common.Utilities
     {
         public static byte[] StreamToBytes(Stream input)
         {
-            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using RecyclableMemoryStream output = StreamToRecyclableMemoryStream(input);
 
+            return output.ToArray();
+        }
 
-            input.CopyTo(stream);
+        public static IMemoryOwner<byte> StreamToRentedMemory(Stream input)
+        {
+            if (input is MemoryStream inputMemoryStream)
+            {
+                return MemoryStreamToRentedMemory(inputMemoryStream);
+            }
+            else if (input.CanSeek)
+            {
+                long bytesExpected = input.Length;
 
-            return stream.ToArray();
+                IMemoryOwner<byte> ownedMemory = ByteMemoryPool.Rent(bytesExpected);
+
+                var destSpan = ownedMemory.Memory.Span;
+
+                int totalBytesRead = 0;
+
+                while (totalBytesRead < bytesExpected)
+                {
+                    int bytesRead = input.Read(destSpan[totalBytesRead..]);
+
+                    if (bytesRead == 0)
+                    {
+                        ownedMemory.Dispose();
+
+                        throw new IOException($"Tried reading {bytesExpected} but the stream closed after reading {totalBytesRead}.");
+                    }
+
+                    totalBytesRead += bytesRead;
+                }
+
+                return ownedMemory;
+            }
+            else
+            {
+                // If input is (non-seekable) then copy twice: first into a RecyclableMemoryStream, then to a rented IMemoryOwner<byte>.
+                using RecyclableMemoryStream output = StreamToRecyclableMemoryStream(input);
+
+                return MemoryStreamToRentedMemory(output);
+            }
         }
 
         public static async Task<byte[]> StreamToBytesAsync(Stream input, CancellationToken cancellationToken = default)
@@ -25,5 +65,26 @@ namespace Ryujinx.Common.Utilities
 
             return stream.ToArray();
         }
+
+        private static IMemoryOwner<byte> MemoryStreamToRentedMemory(MemoryStream input)
+        {
+            input.Position = 0;
+
+            IMemoryOwner<byte> ownedMemory = ByteMemoryPool.Rent(input.Length);
+
+            // Discard the return value because we assume reading a MemoryStream always succeeds completely.
+            _ = input.Read(ownedMemory.Memory.Span);
+
+            return ownedMemory;
+        }
+
+        private static RecyclableMemoryStream StreamToRecyclableMemoryStream(Stream input)
+        {
+            RecyclableMemoryStream stream = MemoryStreamManager.Shared.GetStream();
+
+            input.CopyTo(stream);
+
+            return stream;
+        }
     }
 }
diff --git a/ryujinx/src/Ryujinx.Graphics.Device/DeviceMemoryManager.cs b/ryujinx/src/Ryujinx.Graphics.Device/DeviceMemoryManager.cs
index d64ed30954..fc075a2643 100644
--- a/ryujinx/src/Ryujinx.Graphics.Device/DeviceMemoryManager.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Device/DeviceMemoryManager.cs
@@ -1,5 +1,7 @@
+using Ryujinx.Common.Memory;
 using Ryujinx.Memory;
 using System;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -143,11 +145,11 @@ namespace Ryujinx.Graphics.Device
             }
             else
             {
-                Memory<byte> memory = new byte[size];
+                IMemoryOwner<byte> memoryOwner = ByteMemoryPool.Rent(size);
 
-                GetSpan(va, size).CopyTo(memory.Span);
+                GetSpan(va, size).CopyTo(memoryOwner.Memory.Span);
 
-                return new WritableRegion(this, va, memory, tracked: true);
+                return new WritableRegion(this, va, memoryOwner, tracked: true);
             }
         }
 
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/ITexture.cs b/ryujinx/src/Ryujinx.Graphics.GAL/ITexture.cs
index 5a4623a66d..2d9c6b7990 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/ITexture.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/ITexture.cs
@@ -1,4 +1,4 @@
-using Ryujinx.Common.Memory;
+using System.Buffers;
 
 namespace Ryujinx.Graphics.GAL
 {
@@ -17,10 +17,34 @@ namespace Ryujinx.Graphics.GAL
         PinnedSpan<byte> GetData();
         PinnedSpan<byte> GetData(int layer, int level);
 
-        void SetData(SpanOrArray<byte> data);
-        void SetData(SpanOrArray<byte> data, int layer, int level);
-        void SetData(SpanOrArray<byte> data, int layer, int level, Rectangle<int> region);
+        /// <summary>
+        /// Sets the texture data. The data passed as a <see cref="IMemoryOwner{Byte}" /> will be disposed when
+        /// the operation completes.
+        /// </summary>
+        /// <param name="data">Texture data bytes</param>
+        void SetData(IMemoryOwner<byte> data);
+
+        /// <summary>
+        /// Sets the texture data. The data passed as a <see cref="IMemoryOwner{Byte}" /> will be disposed when
+        /// the operation completes.
+        /// </summary>
+        /// <param name="data">Texture data bytes</param>
+        /// <param name="layer">Target layer</param>
+        /// <param name="level">Target level</param>
+        void SetData(IMemoryOwner<byte> data, int layer, int level);
+
+        /// <summary>
+        /// Sets the texture data. The data passed as a <see cref="IMemoryOwner{Byte}" /> will be disposed when
+        /// the operation completes.
+        /// </summary>
+        /// <param name="data">Texture data bytes</param>
+        /// <param name="layer">Target layer</param>
+        /// <param name="level">Target level</param>
+        /// <param name="region">Target sub-region of the texture to update</param>
+        void SetData(IMemoryOwner<byte> data, int layer, int level, Rectangle<int> region);
+
         void SetStorage(BufferRange buffer);
+
         void Release();
     }
 }
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataCommand.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataCommand.cs
index 36feeeba75..3aba004dff 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataCommand.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataCommand.cs
@@ -1,6 +1,6 @@
 using Ryujinx.Graphics.GAL.Multithreading.Model;
 using Ryujinx.Graphics.GAL.Multithreading.Resources;
-using System;
+using System.Buffers;
 
 namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture
 {
@@ -8,9 +8,9 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture
     {
         public readonly CommandType CommandType => CommandType.TextureSetData;
         private TableRef<ThreadedTexture> _texture;
-        private TableRef<byte[]> _data;
+        private TableRef<IMemoryOwner<byte>> _data;
 
-        public void Set(TableRef<ThreadedTexture> texture, TableRef<byte[]> data)
+        public void Set(TableRef<ThreadedTexture> texture, TableRef<IMemoryOwner<byte>> data)
         {
             _texture = texture;
             _data = data;
@@ -19,7 +19,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture
         public static void Run(ref TextureSetDataCommand command, ThreadedRenderer threaded, IRenderer renderer)
         {
             ThreadedTexture texture = command._texture.Get(threaded);
-            texture.Base.SetData(new ReadOnlySpan<byte>(command._data.Get(threaded)));
+            texture.Base.SetData(command._data.Get(threaded));
         }
     }
 }
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceCommand.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceCommand.cs
index c50bfe089a..7ad709a757 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceCommand.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceCommand.cs
@@ -1,6 +1,6 @@
 using Ryujinx.Graphics.GAL.Multithreading.Model;
 using Ryujinx.Graphics.GAL.Multithreading.Resources;
-using System;
+using System.Buffers;
 
 namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture
 {
@@ -8,11 +8,11 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture
     {
         public readonly CommandType CommandType => CommandType.TextureSetDataSlice;
         private TableRef<ThreadedTexture> _texture;
-        private TableRef<byte[]> _data;
+        private TableRef<IMemoryOwner<byte>> _data;
         private int _layer;
         private int _level;
 
-        public void Set(TableRef<ThreadedTexture> texture, TableRef<byte[]> data, int layer, int level)
+        public void Set(TableRef<ThreadedTexture> texture, TableRef<IMemoryOwner<byte>> data, int layer, int level)
         {
             _texture = texture;
             _data = data;
@@ -23,7 +23,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture
         public static void Run(ref TextureSetDataSliceCommand command, ThreadedRenderer threaded, IRenderer renderer)
         {
             ThreadedTexture texture = command._texture.Get(threaded);
-            texture.Base.SetData(new ReadOnlySpan<byte>(command._data.Get(threaded)), command._layer, command._level);
+            texture.Base.SetData(command._data.Get(threaded), command._layer, command._level);
         }
     }
 }
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceRegionCommand.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceRegionCommand.cs
index 4c80d9bc3c..c211931bcc 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceRegionCommand.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/Texture/TextureSetDataSliceRegionCommand.cs
@@ -1,6 +1,6 @@
 using Ryujinx.Graphics.GAL.Multithreading.Model;
 using Ryujinx.Graphics.GAL.Multithreading.Resources;
-using System;
+using System.Buffers;
 
 namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture
 {
@@ -8,12 +8,12 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture
     {
         public readonly CommandType CommandType => CommandType.TextureSetDataSliceRegion;
         private TableRef<ThreadedTexture> _texture;
-        private TableRef<byte[]> _data;
+        private TableRef<IMemoryOwner<byte>> _data;
         private int _layer;
         private int _level;
         private Rectangle<int> _region;
 
-        public void Set(TableRef<ThreadedTexture> texture, TableRef<byte[]> data, int layer, int level, Rectangle<int> region)
+        public void Set(TableRef<ThreadedTexture> texture, TableRef<IMemoryOwner<byte>> data, int layer, int level, Rectangle<int> region)
         {
             _texture = texture;
             _data = data;
@@ -25,7 +25,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Commands.Texture
         public static void Run(ref TextureSetDataSliceRegionCommand command, ThreadedRenderer threaded, IRenderer renderer)
         {
             ThreadedTexture texture = command._texture.Get(threaded);
-            texture.Base.SetData(new ReadOnlySpan<byte>(command._data.Get(threaded)), command._layer, command._level, command._region);
+            texture.Base.SetData(command._data.Get(threaded), command._layer, command._level, command._region);
         }
     }
 }
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs
index 9ad9e64548..80003b8447 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs
@@ -1,6 +1,6 @@
-using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL.Multithreading.Commands.Texture;
 using Ryujinx.Graphics.GAL.Multithreading.Model;
+using System.Buffers;
 
 namespace Ryujinx.Graphics.GAL.Multithreading.Resources
 {
@@ -110,21 +110,24 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
             _renderer.QueueCommand();
         }
 
-        public void SetData(SpanOrArray<byte> data)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data)
         {
-            _renderer.New<TextureSetDataCommand>().Set(Ref(this), Ref(data.ToArray()));
+            _renderer.New<TextureSetDataCommand>().Set(Ref(this), Ref(data));
             _renderer.QueueCommand();
         }
 
-        public void SetData(SpanOrArray<byte> data, int layer, int level)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data, int layer, int level)
         {
-            _renderer.New<TextureSetDataSliceCommand>().Set(Ref(this), Ref(data.ToArray()), layer, level);
+            _renderer.New<TextureSetDataSliceCommand>().Set(Ref(this), Ref(data), layer, level);
             _renderer.QueueCommand();
         }
 
-        public void SetData(SpanOrArray<byte> data, int layer, int level, Rectangle<int> region)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data, int layer, int level, Rectangle<int> region)
         {
-            _renderer.New<TextureSetDataSliceRegionCommand>().Set(Ref(this), Ref(data.ToArray()), layer, level, region);
+            _renderer.New<TextureSetDataSliceRegionCommand>().Set(Ref(this), Ref(data), layer, level, region);
             _renderer.QueueCommand();
         }
 
diff --git a/ryujinx/src/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs b/ryujinx/src/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs
index de395d574f..218db15cfd 100644
--- a/ryujinx/src/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs
@@ -4,6 +4,7 @@ using Ryujinx.Graphics.Gpu.Engine.Threed;
 using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Texture;
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -308,7 +309,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
 
                     if (target != null)
                     {
-                        byte[] data;
+                        IMemoryOwner<byte> data;
                         if (srcLinear)
                         {
                             data = LayoutConverter.ConvertLinearStridedToLinear(
diff --git a/ryujinx/src/Ryujinx.Graphics.Gpu/Engine/InlineToMemory/InlineToMemoryClass.cs b/ryujinx/src/Ryujinx.Graphics.Gpu/Engine/InlineToMemory/InlineToMemoryClass.cs
index 37d74fdd34..93e43ce3c5 100644
--- a/ryujinx/src/Ryujinx.Graphics.Gpu/Engine/InlineToMemory/InlineToMemoryClass.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Gpu/Engine/InlineToMemory/InlineToMemoryClass.cs
@@ -1,4 +1,5 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.Device;
 using Ryujinx.Graphics.Texture;
 using System;
@@ -198,7 +199,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
                     if (target != null)
                     {
                         target.SynchronizeMemory();
-                        target.SetData(data, 0, 0, new GAL.Rectangle<int>(_dstX, _dstY, _lineLengthIn / target.Info.FormatInfo.BytesPerPixel, _lineCount));
+                        var dataCopy = ByteMemoryPool.RentCopy(data);
+                        target.SetData(dataCopy, 0, 0, new GAL.Rectangle<int>(_dstX, _dstY, _lineLengthIn / target.Info.FormatInfo.BytesPerPixel, _lineCount));
                         target.SignalModified();
 
                         return;
diff --git a/ryujinx/src/Ryujinx.Graphics.Gpu/Image/Texture.cs b/ryujinx/src/Ryujinx.Graphics.Gpu/Image/Texture.cs
index 7a043b2b7c..e67caea81f 100644
--- a/ryujinx/src/Ryujinx.Graphics.Gpu/Image/Texture.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Gpu/Image/Texture.cs
@@ -1,5 +1,4 @@
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Texture;
@@ -7,6 +6,7 @@ using Ryujinx.Graphics.Texture.Astc;
 using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -661,7 +661,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                 }
             }
 
-            SpanOrArray<byte> result = ConvertToHostCompatibleFormat(data);
+            IMemoryOwner<byte> result = ConvertToHostCompatibleFormat(data);
 
             if (ScaleFactor != 1f && AllowScaledSetData())
             {
@@ -684,7 +684,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// Uploads new texture data to the host GPU.
         /// </summary>
         /// <param name="data">New data</param>
-        public void SetData(SpanOrArray<byte> data)
+        public void SetData(IMemoryOwner<byte> data)
         {
             BlacklistScale();
 
@@ -703,7 +703,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="data">New data</param>
         /// <param name="layer">Target layer</param>
         /// <param name="level">Target level</param>
-        public void SetData(SpanOrArray<byte> data, int layer, int level)
+        public void SetData(IMemoryOwner<byte> data, int layer, int level)
         {
             BlacklistScale();
 
@@ -721,7 +721,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="layer">Target layer</param>
         /// <param name="level">Target level</param>
         /// <param name="region">Target sub-region of the texture to update</param>
-        public void SetData(ReadOnlySpan<byte> data, int layer, int level, Rectangle<int> region)
+        public void SetData(IMemoryOwner<byte> data, int layer, int level, Rectangle<int> region)
         {
             BlacklistScale();
 
@@ -739,7 +739,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="level">Mip level to convert</param>
         /// <param name="single">True to convert a single slice</param>
         /// <returns>Converted data</returns>
-        public SpanOrArray<byte> ConvertToHostCompatibleFormat(ReadOnlySpan<byte> data, int level = 0, bool single = false)
+        public IMemoryOwner<byte> ConvertToHostCompatibleFormat(ReadOnlySpan<byte> data, int level = 0, bool single = false)
         {
             int width = Info.Width;
             int height = Info.Height;
@@ -754,11 +754,11 @@ namespace Ryujinx.Graphics.Gpu.Image
 
             int sliceDepth = single ? 1 : depth;
 
-            SpanOrArray<byte> result;
+            IMemoryOwner<byte> linear;
 
             if (Info.IsLinear)
             {
-                result = LayoutConverter.ConvertLinearStridedToLinear(
+                linear = LayoutConverter.ConvertLinearStridedToLinear(
                     width,
                     height,
                     Info.FormatInfo.BlockWidth,
@@ -770,7 +770,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             }
             else
             {
-                result = LayoutConverter.ConvertBlockLinearToLinear(
+                linear = LayoutConverter.ConvertBlockLinearToLinear(
                     width,
                     height,
                     depth,
@@ -787,33 +787,41 @@ namespace Ryujinx.Graphics.Gpu.Image
                     data);
             }
 
+            IMemoryOwner<byte> result = linear;
+
             // Handle compressed cases not supported by the host:
             // - ASTC is usually not supported on desktop cards.
             // - BC4/BC5 is not supported on 3D textures.
             if (!_context.Capabilities.SupportsAstcCompression && Format.IsAstc())
             {
-                if (!AstcDecoder.TryDecodeToRgba8P(
-                    result.ToArray(),
-                    Info.FormatInfo.BlockWidth,
-                    Info.FormatInfo.BlockHeight,
-                    width,
-                    height,
-                    sliceDepth,
-                    levels,
-                    layers,
-                    out byte[] decoded))
+                using (result)
                 {
-                    string texInfo = $"{Info.Target} {Info.FormatInfo.Format} {Info.Width}x{Info.Height}x{Info.DepthOrLayers} levels {Info.Levels}";
+                    if (!AstcDecoder.TryDecodeToRgba8P(
+                        result.Memory,
+                        Info.FormatInfo.BlockWidth,
+                        Info.FormatInfo.BlockHeight,
+                        width,
+                        height,
+                        sliceDepth,
+                        levels,
+                        layers,
+                        out IMemoryOwner<byte> decoded))
+                    {
+                        string texInfo = $"{Info.Target} {Info.FormatInfo.Format} {Info.Width}x{Info.Height}x{Info.DepthOrLayers} levels {Info.Levels}";
 
-                    Logger.Debug?.Print(LogClass.Gpu, $"Invalid ASTC texture at 0x{Info.GpuAddress:X} ({texInfo}).");
+                        Logger.Debug?.Print(LogClass.Gpu, $"Invalid ASTC texture at 0x{Info.GpuAddress:X} ({texInfo}).");
+                    }
+
+                    if (GraphicsConfig.EnableTextureRecompression)
+                    {
+                        using (decoded)
+                        {
+                            return BCnEncoder.EncodeBC7(decoded.Memory, width, height, sliceDepth, levels, layers);
+                        }
+                    }
+
+                    return decoded;
                 }
-
-                if (GraphicsConfig.EnableTextureRecompression)
-                {
-                    decoded = BCnEncoder.EncodeBC7(decoded, width, height, sliceDepth, levels, layers);
-                }
-
-                result = decoded;
             }
             else if (!_context.Capabilities.SupportsEtc2Compression && Format.IsEtc2())
             {
@@ -821,16 +829,22 @@ namespace Ryujinx.Graphics.Gpu.Image
                 {
                     case Format.Etc2RgbaSrgb:
                     case Format.Etc2RgbaUnorm:
-                        result = ETC2Decoder.DecodeRgba(result, width, height, sliceDepth, levels, layers);
-                        break;
+                        using (result)
+                        {
+                            return ETC2Decoder.DecodeRgba(result.Memory.Span, width, height, sliceDepth, levels, layers);
+                        }
                     case Format.Etc2RgbPtaSrgb:
                     case Format.Etc2RgbPtaUnorm:
-                        result = ETC2Decoder.DecodePta(result, width, height, sliceDepth, levels, layers);
-                        break;
+                        using (result)
+                        {
+                            return ETC2Decoder.DecodePta(result.Memory.Span, width, height, sliceDepth, levels, layers);
+                        }
                     case Format.Etc2RgbSrgb:
                     case Format.Etc2RgbUnorm:
-                        result = ETC2Decoder.DecodeRgb(result, width, height, sliceDepth, levels, layers);
-                        break;
+                        using (result)
+                        {
+                            return ETC2Decoder.DecodeRgb(result.Memory.Span, width, height, sliceDepth, levels, layers);
+                        }
                 }
             }
             else if (!TextureCompatibility.HostSupportsBcFormat(Format, Target, _context.Capabilities))
@@ -839,48 +853,75 @@ namespace Ryujinx.Graphics.Gpu.Image
                 {
                     case Format.Bc1RgbaSrgb:
                     case Format.Bc1RgbaUnorm:
-                        result = BCnDecoder.DecodeBC1(result, width, height, sliceDepth, levels, layers);
-                        break;
+                        using (result)
+                        {
+                            return BCnDecoder.DecodeBC1(result.Memory.Span, width, height, sliceDepth, levels, layers);
+                        }
                     case Format.Bc2Srgb:
                     case Format.Bc2Unorm:
-                        result = BCnDecoder.DecodeBC2(result, width, height, sliceDepth, levels, layers);
-                        break;
+                        using (result)
+                        {
+                            return BCnDecoder.DecodeBC2(result.Memory.Span, width, height, sliceDepth, levels, layers);
+                        }
                     case Format.Bc3Srgb:
                     case Format.Bc3Unorm:
-                        result = BCnDecoder.DecodeBC3(result, width, height, sliceDepth, levels, layers);
-                        break;
+                        using (result)
+                        {
+                            return BCnDecoder.DecodeBC3(result.Memory.Span, width, height, sliceDepth, levels, layers);
+                        }
                     case Format.Bc4Snorm:
                     case Format.Bc4Unorm:
-                        result = BCnDecoder.DecodeBC4(result, width, height, sliceDepth, levels, layers, Format == Format.Bc4Snorm);
-                        break;
+                        using (result)
+                        {
+                            return BCnDecoder.DecodeBC4(result.Memory.Span, width, height, sliceDepth, levels, layers, Format == Format.Bc4Snorm);
+                        }
                     case Format.Bc5Snorm:
                     case Format.Bc5Unorm:
-                        result = BCnDecoder.DecodeBC5(result, width, height, sliceDepth, levels, layers, Format == Format.Bc5Snorm);
-                        break;
+                        using (result)
+                        {
+                            return BCnDecoder.DecodeBC5(result.Memory.Span, width, height, sliceDepth, levels, layers, Format == Format.Bc5Snorm);
+                        }
                     case Format.Bc6HSfloat:
                     case Format.Bc6HUfloat:
-                        result = BCnDecoder.DecodeBC6(result, width, height, sliceDepth, levels, layers, Format == Format.Bc6HSfloat);
-                        break;
+                        using (result)
+                        {
+                            return BCnDecoder.DecodeBC6(result.Memory.Span, width, height, sliceDepth, levels, layers, Format == Format.Bc6HSfloat);
+                        }
                     case Format.Bc7Srgb:
                     case Format.Bc7Unorm:
-                        result = BCnDecoder.DecodeBC7(result, width, height, sliceDepth, levels, layers);
-                        break;
+                        using (result)
+                        {
+                            return BCnDecoder.DecodeBC7(result.Memory.Span, width, height, sliceDepth, levels, layers);
+                        }
                 }
             }
             else if (!_context.Capabilities.SupportsR4G4Format && Format == Format.R4G4Unorm)
             {
-                result = PixelConverter.ConvertR4G4ToR4G4B4A4(result, width);
-
-                if (!_context.Capabilities.SupportsR4G4B4A4Format)
+                using (result)
                 {
-                    result = PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(result, width);
+                    var converted = PixelConverter.ConvertR4G4ToR4G4B4A4(result.Memory.Span, width);
+
+                    if (_context.Capabilities.SupportsR4G4B4A4Format)
+                    {
+                        return converted;
+                    }
+                    else
+                    {
+                        using (converted)
+                        {
+                            return PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(converted.Memory.Span, width);
+                        }
+                    }
                 }
             }
             else if (Format == Format.R4G4B4A4Unorm)
             {
                 if (!_context.Capabilities.SupportsR4G4B4A4Format)
                 {
-                    result = PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(result, width);
+                    using (result)
+                    {
+                        return PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(result.Memory.Span, width);
+                    }
                 }
             }
             else if (!_context.Capabilities.Supports5BitComponentFormat && Format.Is16BitPacked())
@@ -889,19 +930,27 @@ namespace Ryujinx.Graphics.Gpu.Image
                 {
                     case Format.B5G6R5Unorm:
                     case Format.R5G6B5Unorm:
-                        result = PixelConverter.ConvertR5G6B5ToR8G8B8A8(result, width);
-                        break;
+                        using (result)
+                        {
+                            return PixelConverter.ConvertR5G6B5ToR8G8B8A8(result.Memory.Span, width);
+                        }
                     case Format.B5G5R5A1Unorm:
                     case Format.R5G5B5X1Unorm:
                     case Format.R5G5B5A1Unorm:
-                        result = PixelConverter.ConvertR5G5B5ToR8G8B8A8(result, width, Format == Format.R5G5B5X1Unorm);
-                        break;
+                        using (result)
+                        {
+                            return PixelConverter.ConvertR5G5B5ToR8G8B8A8(result.Memory.Span, width, Format == Format.R5G5B5X1Unorm);
+                        }
                     case Format.A1B5G5R5Unorm:
-                        result = PixelConverter.ConvertA1B5G5R5ToR8G8B8A8(result, width);
-                        break;
+                        using (result)
+                        {
+                            return PixelConverter.ConvertA1B5G5R5ToR8G8B8A8(result.Memory.Span, width);
+                        }
                     case Format.R4G4B4A4Unorm:
-                        result = PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(result, width);
-                        break;
+                        using (result)
+                        {
+                            return PixelConverter.ConvertR4G4B4A4ToR8G8B8A8(result.Memory.Span, width);
+                        }
                 }
             }
 
diff --git a/ryujinx/src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs b/ryujinx/src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
index 9785839426..de9c47c976 100644
--- a/ryujinx/src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs
@@ -1,4 +1,3 @@
-using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Texture;
@@ -6,6 +5,7 @@ using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
 using Ryujinx.Memory.Tracking;
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
@@ -445,7 +445,7 @@ namespace Ryujinx.Graphics.Gpu.Image
 
                             ReadOnlySpan<byte> data = dataSpan[(offset - spanBase)..];
 
-                            SpanOrArray<byte> result = Storage.ConvertToHostCompatibleFormat(data, info.BaseLevel + level, true);
+                            IMemoryOwner<byte> result = Storage.ConvertToHostCompatibleFormat(data, info.BaseLevel + level, true);
 
                             Storage.SetData(result, info.BaseLayer + layer, info.BaseLevel + level);
                         }
diff --git a/ryujinx/src/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs b/ryujinx/src/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs
index 30f87813f3..0b6c78fac3 100644
--- a/ryujinx/src/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs
@@ -1,6 +1,8 @@
+using Ryujinx.Common.Memory;
 using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -240,11 +242,11 @@ namespace Ryujinx.Graphics.Gpu.Memory
             }
             else
             {
-                Memory<byte> memory = new byte[size];
+                IMemoryOwner<byte> memoryOwner = ByteMemoryPool.Rent(size);
 
-                GetSpan(va, size).CopyTo(memory.Span);
+                GetSpan(va, size).CopyTo(memoryOwner.Memory.Span);
 
-                return new WritableRegion(this, va, memory, tracked);
+                return new WritableRegion(this, va, memoryOwner, tracked);
             }
         }
 
diff --git a/ryujinx/src/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs b/ryujinx/src/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
index ce970fab7c..4d09c3aabd 100644
--- a/ryujinx/src/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
@@ -1,3 +1,4 @@
+using Ryujinx.Common.Memory;
 using Ryujinx.Cpu;
 using Ryujinx.Graphics.Device;
 using Ryujinx.Graphics.Gpu.Image;
@@ -6,6 +7,7 @@ using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
 using Ryujinx.Memory.Tracking;
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -190,7 +192,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
             }
             else
             {
-                Memory<byte> memory = new byte[range.GetSize()];
+                IMemoryOwner<byte> memoryOwner = ByteMemoryPool.Rent(range.GetSize());
+
+                Memory<byte> memory = memoryOwner.Memory;
 
                 int offset = 0;
                 for (int i = 0; i < range.Count; i++)
@@ -204,7 +208,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                     offset += size;
                 }
 
-                return new WritableRegion(new MultiRangeWritableBlock(range, this), 0, memory, tracked);
+                return new WritableRegion(new MultiRangeWritableBlock(range, this), 0, memoryOwner, tracked);
             }
         }
 
diff --git a/ryujinx/src/Ryujinx.Graphics.OpenGL/Effects/SmaaPostProcessingEffect.cs b/ryujinx/src/Ryujinx.Graphics.OpenGL/Effects/SmaaPostProcessingEffect.cs
index 46dda13f22..a6c5e4acab 100644
--- a/ryujinx/src/Ryujinx.Graphics.OpenGL/Effects/SmaaPostProcessingEffect.cs
+++ b/ryujinx/src/Ryujinx.Graphics.OpenGL/Effects/SmaaPostProcessingEffect.cs
@@ -33,7 +33,8 @@ namespace Ryujinx.Graphics.OpenGL.Effects.Smaa
 
         public int Quality
         {
-            get => _quality; set
+            get => _quality;
+            set
             {
                 _quality = Math.Clamp(value, 0, _qualities.Length - 1);
             }
@@ -150,8 +151,8 @@ namespace Ryujinx.Graphics.OpenGL.Effects.Smaa
             _areaTexture = new TextureStorage(_renderer, areaInfo);
             _searchTexture = new TextureStorage(_renderer, searchInfo);
 
-            var areaTexture = EmbeddedResources.Read("Ryujinx.Graphics.OpenGL/Effects/Textures/SmaaAreaTexture.bin");
-            var searchTexture = EmbeddedResources.Read("Ryujinx.Graphics.OpenGL/Effects/Textures/SmaaSearchTexture.bin");
+            var areaTexture = EmbeddedResources.ReadFileToRentedMemory("Ryujinx.Graphics.OpenGL/Effects/Textures/SmaaAreaTexture.bin");
+            var searchTexture = EmbeddedResources.ReadFileToRentedMemory("Ryujinx.Graphics.OpenGL/Effects/Textures/SmaaSearchTexture.bin");
 
             var areaView = _areaTexture.CreateDefaultView();
             var searchView = _searchTexture.CreateDefaultView();
diff --git a/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/FormatConverter.cs b/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/FormatConverter.cs
index c4bbf74566..434f25900c 100644
--- a/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/FormatConverter.cs
+++ b/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/FormatConverter.cs
@@ -1,4 +1,6 @@
+using Ryujinx.Common.Memory;
 using System;
+using System.Buffers;
 using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics;
@@ -8,9 +10,11 @@ namespace Ryujinx.Graphics.OpenGL.Image
 {
     static class FormatConverter
     {
-        public unsafe static byte[] ConvertS8D24ToD24S8(ReadOnlySpan<byte> data)
+        public unsafe static IMemoryOwner<byte> ConvertS8D24ToD24S8(ReadOnlySpan<byte> data)
         {
-            byte[] output = new byte[data.Length];
+            IMemoryOwner<byte> outputMemory = ByteMemoryPool.Rent(data.Length);
+
+            Span<byte> output = outputMemory.Memory.Span;
 
             int start = 0;
 
@@ -74,7 +78,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                 outSpan[i] = BitOperations.RotateLeft(dataSpan[i], 8);
             }
 
-            return output;
+            return outputMemory;
         }
 
         public unsafe static byte[] ConvertD24S8ToS8D24(ReadOnlySpan<byte> data)
diff --git a/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs b/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs
index f140b276a5..a8196541a1 100644
--- a/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs
+++ b/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs
@@ -1,7 +1,7 @@
 using OpenTK.Graphics.OpenGL;
-using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL;
 using System;
+using System.Buffers;
 
 namespace Ryujinx.Graphics.OpenGL.Image
 {
@@ -54,19 +54,24 @@ namespace Ryujinx.Graphics.OpenGL.Image
             throw new NotImplementedException();
         }
 
-        public void SetData(SpanOrArray<byte> data)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data)
         {
-            var dataSpan = data.AsSpan();
+            var dataSpan = data.Memory.Span;
 
             Buffer.SetData(_buffer, _bufferOffset, dataSpan[..Math.Min(dataSpan.Length, _bufferSize)]);
+
+            data.Dispose();
         }
 
-        public void SetData(SpanOrArray<byte> data, int layer, int level)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data, int layer, int level)
         {
             throw new NotSupportedException();
         }
 
-        public void SetData(SpanOrArray<byte> data, int layer, int level, Rectangle<int> region)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data, int layer, int level, Rectangle<int> region)
         {
             throw new NotSupportedException();
         }
diff --git a/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs b/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
index 7f1b1c3824..8a18e6132a 100644
--- a/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
+++ b/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
@@ -1,8 +1,8 @@
 using OpenTK.Graphics.OpenGL;
 using Ryujinx.Common;
-using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL;
 using System;
+using System.Buffers;
 using System.Diagnostics;
 
 namespace Ryujinx.Graphics.OpenGL.Image
@@ -448,70 +448,59 @@ namespace Ryujinx.Graphics.OpenGL.Image
             }
         }
 
-        public void SetData(SpanOrArray<byte> data)
+        public void SetData(IMemoryOwner<byte> data)
         {
-            var dataSpan = data.AsSpan();
-
-            if (Format == Format.S8UintD24Unorm)
+            using (data = EnsureDataFormat(data))
             {
-                dataSpan = FormatConverter.ConvertS8D24ToD24S8(dataSpan);
-            }
-
-            unsafe
-            {
-                fixed (byte* ptr = dataSpan)
+                unsafe
                 {
-                    ReadFrom((IntPtr)ptr, dataSpan.Length);
+                    var dataSpan = data.Memory.Span;
+                    fixed (byte* ptr = dataSpan)
+                    {
+                        ReadFrom((IntPtr)ptr, dataSpan.Length);
+                    }
                 }
             }
         }
 
-        public void SetData(SpanOrArray<byte> data, int layer, int level)
+        public void SetData(IMemoryOwner<byte> data, int layer, int level)
         {
-            var dataSpan = data.AsSpan();
-
-            if (Format == Format.S8UintD24Unorm)
+            using (data = EnsureDataFormat(data))
             {
-                dataSpan = FormatConverter.ConvertS8D24ToD24S8(dataSpan);
-            }
-
-            unsafe
-            {
-                fixed (byte* ptr = dataSpan)
+                unsafe
                 {
-                    int width = Math.Max(Info.Width >> level, 1);
-                    int height = Math.Max(Info.Height >> level, 1);
+                    fixed (byte* ptr = data.Memory.Span)
+                    {
+                        int width = Math.Max(Info.Width >> level, 1);
+                        int height = Math.Max(Info.Height >> level, 1);
 
-                    ReadFrom2D((IntPtr)ptr, layer, level, 0, 0, width, height);
+                        ReadFrom2D((IntPtr)ptr, layer, level, 0, 0, width, height);
+                    }
                 }
             }
         }
 
-        public void SetData(SpanOrArray<byte> data, int layer, int level, Rectangle<int> region)
+        public void SetData(IMemoryOwner<byte> data, int layer, int level, Rectangle<int> region)
         {
-            var dataSpan = data.AsSpan();
-
-            if (Format == Format.S8UintD24Unorm)
+            using (data = EnsureDataFormat(data))
             {
-                dataSpan = FormatConverter.ConvertS8D24ToD24S8(dataSpan);
-            }
+                int wInBlocks = BitUtils.DivRoundUp(region.Width, Info.BlockWidth);
+                int hInBlocks = BitUtils.DivRoundUp(region.Height, Info.BlockHeight);
 
-            int wInBlocks = BitUtils.DivRoundUp(region.Width, Info.BlockWidth);
-            int hInBlocks = BitUtils.DivRoundUp(region.Height, Info.BlockHeight);
-
-            unsafe
-            {
-                fixed (byte* ptr = dataSpan)
+                unsafe
                 {
-                    ReadFrom2D(
-                        (IntPtr)ptr,
-                        layer,
-                        level,
-                        region.X,
-                        region.Y,
-                        region.Width,
-                        region.Height,
-                        BitUtils.AlignUp(wInBlocks * Info.BytesPerPixel, 4) * hInBlocks);
+                    fixed (byte* ptr = data.Memory.Span)
+                    {
+                        ReadFrom2D(
+                            (IntPtr)ptr,
+                            layer,
+                            level,
+                            region.X,
+                            region.Y,
+                            region.Width,
+                            region.Height,
+                            BitUtils.AlignUp(wInBlocks * Info.BytesPerPixel, 4) * hInBlocks);
+                    }
                 }
             }
         }
@@ -533,6 +522,19 @@ namespace Ryujinx.Graphics.OpenGL.Image
             ReadFrom2D(data, layer, level, x, y, width, height, mipSize);
         }
 
+        private IMemoryOwner<byte> EnsureDataFormat(IMemoryOwner<byte> data)
+        {
+            if (Format == Format.S8UintD24Unorm)
+            {
+                using (data)
+                {
+                    return FormatConverter.ConvertS8D24ToD24S8(data.Memory.Span);
+                }
+            }
+
+            return data;
+        }
+
         private void ReadFrom2D(IntPtr data, int layer, int level, int x, int y, int width, int height, int mipSize)
         {
             TextureTarget target = Target.Convert();
diff --git a/ryujinx/src/Ryujinx.Graphics.Texture/Astc/AstcDecoder.cs b/ryujinx/src/Ryujinx.Graphics.Texture/Astc/AstcDecoder.cs
index edf699dc32..3f65e1225b 100644
--- a/ryujinx/src/Ryujinx.Graphics.Texture/Astc/AstcDecoder.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Texture/Astc/AstcDecoder.cs
@@ -1,5 +1,7 @@
+using Ryujinx.Common.Memory;
 using Ryujinx.Common.Utilities;
 using System;
+using System.Buffers;
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -291,16 +293,14 @@ namespace Ryujinx.Graphics.Texture.Astc
             int depth,
             int levels,
             int layers,
-            out byte[] decoded)
+            out IMemoryOwner<byte> decoded)
         {
-            byte[] output = new byte[QueryDecompressedSize(width, height, depth, levels, layers)];
+            decoded = ByteMemoryPool.Rent(QueryDecompressedSize(width, height, depth, levels, layers));
 
-            AstcDecoder decoder = new(data, output, blockWidth, blockHeight, width, height, depth, levels, layers);
+            AstcDecoder decoder = new(data, decoded.Memory, blockWidth, blockHeight, width, height, depth, levels, layers);
 
             Enumerable.Range(0, decoder.TotalBlockCount).AsParallel().ForAll(x => decoder.ProcessBlock(x));
 
-            decoded = output;
-
             return decoder.Success;
         }
 
diff --git a/ryujinx/src/Ryujinx.Graphics.Texture/BCnDecoder.cs b/ryujinx/src/Ryujinx.Graphics.Texture/BCnDecoder.cs
index 2d68ca3468..eb85334a21 100644
--- a/ryujinx/src/Ryujinx.Graphics.Texture/BCnDecoder.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Texture/BCnDecoder.cs
@@ -1,5 +1,7 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Memory;
 using System;
+using System.Buffers;
 using System.Buffers.Binary;
 using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics;
@@ -12,7 +14,7 @@ namespace Ryujinx.Graphics.Texture
         private const int BlockWidth = 4;
         private const int BlockHeight = 4;
 
-        public static byte[] DecodeBC1(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
+        public static IMemoryOwner<byte> DecodeBC1(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
         {
             int size = 0;
 
@@ -21,12 +23,12 @@ namespace Ryujinx.Graphics.Texture
                 size += Math.Max(1, width >> l) * Math.Max(1, height >> l) * Math.Max(1, depth >> l) * layers * 4;
             }
 
-            byte[] output = new byte[size];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(size);
 
             Span<byte> tile = stackalloc byte[BlockWidth * BlockHeight * 4];
 
             Span<uint> tileAsUint = MemoryMarshal.Cast<byte, uint>(tile);
-            Span<uint> outputAsUint = MemoryMarshal.Cast<byte, uint>(output);
+            Span<uint> outputAsUint = MemoryMarshal.Cast<byte, uint>(output.Memory.Span);
 
             Span<Vector128<byte>> tileAsVector128 = MemoryMarshal.Cast<byte, Vector128<byte>>(tile);
 
@@ -100,7 +102,7 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public static byte[] DecodeBC2(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
+        public static IMemoryOwner<byte> DecodeBC2(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
         {
             int size = 0;
 
@@ -109,12 +111,12 @@ namespace Ryujinx.Graphics.Texture
                 size += Math.Max(1, width >> l) * Math.Max(1, height >> l) * Math.Max(1, depth >> l) * layers * 4;
             }
 
-            byte[] output = new byte[size];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(size);
 
             Span<byte> tile = stackalloc byte[BlockWidth * BlockHeight * 4];
 
             Span<uint> tileAsUint = MemoryMarshal.Cast<byte, uint>(tile);
-            Span<uint> outputAsUint = MemoryMarshal.Cast<byte, uint>(output);
+            Span<uint> outputAsUint = MemoryMarshal.Cast<byte, uint>(output.Memory.Span);
 
             Span<Vector128<byte>> tileAsVector128 = MemoryMarshal.Cast<byte, Vector128<byte>>(tile);
 
@@ -195,7 +197,7 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public static byte[] DecodeBC3(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
+        public static IMemoryOwner<byte> DecodeBC3(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
         {
             int size = 0;
 
@@ -204,13 +206,13 @@ namespace Ryujinx.Graphics.Texture
                 size += Math.Max(1, width >> l) * Math.Max(1, height >> l) * Math.Max(1, depth >> l) * layers * 4;
             }
 
-            byte[] output = new byte[size];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(size);
 
             Span<byte> tile = stackalloc byte[BlockWidth * BlockHeight * 4];
             Span<byte> rPal = stackalloc byte[8];
 
             Span<uint> tileAsUint = MemoryMarshal.Cast<byte, uint>(tile);
-            Span<uint> outputAsUint = MemoryMarshal.Cast<byte, uint>(output);
+            Span<uint> outputAsUint = MemoryMarshal.Cast<byte, uint>(output.Memory.Span);
 
             Span<Vector128<byte>> tileAsVector128 = MemoryMarshal.Cast<byte, Vector128<byte>>(tile);
 
@@ -292,7 +294,7 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public static byte[] DecodeBC4(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers, bool signed)
+        public static IMemoryOwner<byte> DecodeBC4(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers, bool signed)
         {
             int size = 0;
 
@@ -304,8 +306,8 @@ namespace Ryujinx.Graphics.Texture
             // Backends currently expect a stride alignment of 4 bytes, so output width must be aligned.
             int alignedWidth = BitUtils.AlignUp(width, 4);
 
-            byte[] output = new byte[size];
-            Span<byte> outputSpan = new(output);
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(size);
+            Span<byte> outputSpan = output.Memory.Span;
 
             ReadOnlySpan<ulong> data64 = MemoryMarshal.Cast<byte, ulong>(data);
 
@@ -400,7 +402,7 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public static byte[] DecodeBC5(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers, bool signed)
+        public static IMemoryOwner<byte> DecodeBC5(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers, bool signed)
         {
             int size = 0;
 
@@ -412,7 +414,7 @@ namespace Ryujinx.Graphics.Texture
             // Backends currently expect a stride alignment of 4 bytes, so output width must be aligned.
             int alignedWidth = BitUtils.AlignUp(width, 2);
 
-            byte[] output = new byte[size];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(size);
 
             ReadOnlySpan<ulong> data64 = MemoryMarshal.Cast<byte, ulong>(data);
 
@@ -421,7 +423,7 @@ namespace Ryujinx.Graphics.Texture
             Span<byte> rPal = stackalloc byte[8];
             Span<byte> gPal = stackalloc byte[8];
 
-            Span<ushort> outputAsUshort = MemoryMarshal.Cast<byte, ushort>(output);
+            Span<ushort> outputAsUshort = MemoryMarshal.Cast<byte, ushort>(output.Memory.Span);
 
             Span<uint> rTileAsUint = MemoryMarshal.Cast<byte, uint>(rTile);
             Span<uint> gTileAsUint = MemoryMarshal.Cast<byte, uint>(gTile);
@@ -525,7 +527,7 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public static byte[] DecodeBC6(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers, bool signed)
+        public static IMemoryOwner<byte> DecodeBC6(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers, bool signed)
         {
             int size = 0;
 
@@ -534,7 +536,8 @@ namespace Ryujinx.Graphics.Texture
                 size += Math.Max(1, width >> l) * Math.Max(1, height >> l) * Math.Max(1, depth >> l) * layers * 8;
             }
 
-            byte[] output = new byte[size];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(size);
+            Span<byte> outputSpan = output.Memory.Span;
 
             int inputOffset = 0;
             int outputOffset = 0;
@@ -548,7 +551,7 @@ namespace Ryujinx.Graphics.Texture
                 {
                     for (int z = 0; z < depth; z++)
                     {
-                        BC6Decoder.Decode(output.AsSpan()[outputOffset..], data[inputOffset..], width, height, signed);
+                        BC6Decoder.Decode(outputSpan[outputOffset..], data[inputOffset..], width, height, signed);
 
                         inputOffset += w * h * 16;
                         outputOffset += width * height * 8;
@@ -563,7 +566,7 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public static byte[] DecodeBC7(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
+        public static IMemoryOwner<byte> DecodeBC7(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
         {
             int size = 0;
 
@@ -572,7 +575,8 @@ namespace Ryujinx.Graphics.Texture
                 size += Math.Max(1, width >> l) * Math.Max(1, height >> l) * Math.Max(1, depth >> l) * layers * 4;
             }
 
-            byte[] output = new byte[size];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(size);
+            Span<byte> outputSpan = output.Memory.Span;
 
             int inputOffset = 0;
             int outputOffset = 0;
@@ -586,7 +590,7 @@ namespace Ryujinx.Graphics.Texture
                 {
                     for (int z = 0; z < depth; z++)
                     {
-                        BC7Decoder.Decode(output.AsSpan()[outputOffset..], data[inputOffset..], width, height);
+                        BC7Decoder.Decode(outputSpan[outputOffset..], data[inputOffset..], width, height);
 
                         inputOffset += w * h * 16;
                         outputOffset += width * height * 4;
diff --git a/ryujinx/src/Ryujinx.Graphics.Texture/BCnEncoder.cs b/ryujinx/src/Ryujinx.Graphics.Texture/BCnEncoder.cs
index 8103990ff3..253ba305cd 100644
--- a/ryujinx/src/Ryujinx.Graphics.Texture/BCnEncoder.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Texture/BCnEncoder.cs
@@ -1,6 +1,8 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.Texture.Encoders;
 using System;
+using System.Buffers;
 
 namespace Ryujinx.Graphics.Texture
 {
@@ -9,7 +11,7 @@ namespace Ryujinx.Graphics.Texture
         private const int BlockWidth = 4;
         private const int BlockHeight = 4;
 
-        public static byte[] EncodeBC7(byte[] data, int width, int height, int depth, int levels, int layers)
+        public static IMemoryOwner<byte> EncodeBC7(Memory<byte> data, int width, int height, int depth, int levels, int layers)
         {
             int size = 0;
 
@@ -21,7 +23,8 @@ namespace Ryujinx.Graphics.Texture
                 size += w * h * 16 * Math.Max(1, depth >> l) * layers;
             }
 
-            byte[] output = new byte[size];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(size);
+            Memory<byte> outputMemory = output.Memory;
 
             int imageBaseIOffs = 0;
             int imageBaseOOffs = 0;
@@ -36,8 +39,8 @@ namespace Ryujinx.Graphics.Texture
                     for (int z = 0; z < depth; z++)
                     {
                         BC7Encoder.Encode(
-                            output.AsMemory()[imageBaseOOffs..],
-                            data.AsMemory()[imageBaseIOffs..],
+                            outputMemory[imageBaseOOffs..],
+                            data[imageBaseIOffs..],
                             width,
                             height,
                             EncodeMode.Fast | EncodeMode.Multithreaded);
diff --git a/ryujinx/src/Ryujinx.Graphics.Texture/ETC2Decoder.cs b/ryujinx/src/Ryujinx.Graphics.Texture/ETC2Decoder.cs
index 57f2e98d08..52801ff47d 100644
--- a/ryujinx/src/Ryujinx.Graphics.Texture/ETC2Decoder.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Texture/ETC2Decoder.cs
@@ -1,5 +1,7 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Memory;
 using System;
+using System.Buffers;
 using System.Buffers.Binary;
 using System.Runtime.InteropServices;
 
@@ -49,15 +51,15 @@ namespace Ryujinx.Graphics.Texture
             new int[] { -3, -5, -7, -9, 2, 4, 6, 8 },
         };
 
-        public static byte[] DecodeRgb(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
+        public static IMemoryOwner<byte> DecodeRgb(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
         {
             ReadOnlySpan<ulong> dataUlong = MemoryMarshal.Cast<byte, ulong>(data);
 
             int inputOffset = 0;
 
-            byte[] output = new byte[CalculateOutputSize(width, height, depth, levels, layers)];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(CalculateOutputSize(width, height, depth, levels, layers));
 
-            Span<uint> outputUint = MemoryMarshal.Cast<byte, uint>(output);
+            Span<uint> outputUint = MemoryMarshal.Cast<byte, uint>(output.Memory.Span);
             Span<uint> tile = stackalloc uint[BlockWidth * BlockHeight];
 
             int imageBaseOOffs = 0;
@@ -111,15 +113,15 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public static byte[] DecodePta(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
+        public static IMemoryOwner<byte> DecodePta(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
         {
             ReadOnlySpan<ulong> dataUlong = MemoryMarshal.Cast<byte, ulong>(data);
 
             int inputOffset = 0;
 
-            byte[] output = new byte[CalculateOutputSize(width, height, depth, levels, layers)];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(CalculateOutputSize(width, height, depth, levels, layers));
 
-            Span<uint> outputUint = MemoryMarshal.Cast<byte, uint>(output);
+            Span<uint> outputUint = MemoryMarshal.Cast<byte, uint>(output.Memory.Span);
             Span<uint> tile = stackalloc uint[BlockWidth * BlockHeight];
 
             int imageBaseOOffs = 0;
@@ -168,15 +170,15 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public static byte[] DecodeRgba(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
+        public static IMemoryOwner<byte> DecodeRgba(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)
         {
             ReadOnlySpan<ulong> dataUlong = MemoryMarshal.Cast<byte, ulong>(data);
 
             int inputOffset = 0;
 
-            byte[] output = new byte[CalculateOutputSize(width, height, depth, levels, layers)];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(CalculateOutputSize(width, height, depth, levels, layers));
 
-            Span<uint> outputUint = MemoryMarshal.Cast<byte, uint>(output);
+            Span<uint> outputUint = MemoryMarshal.Cast<byte, uint>(output.Memory.Span);
             Span<uint> tile = stackalloc uint[BlockWidth * BlockHeight];
 
             int imageBaseOOffs = 0;
diff --git a/ryujinx/src/Ryujinx.Graphics.Texture/LayoutConverter.cs b/ryujinx/src/Ryujinx.Graphics.Texture/LayoutConverter.cs
index d9a666c3f0..d6732674b5 100644
--- a/ryujinx/src/Ryujinx.Graphics.Texture/LayoutConverter.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Texture/LayoutConverter.cs
@@ -1,5 +1,7 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Memory;
 using System;
+using System.Buffers;
 using System.Runtime.Intrinsics;
 using static Ryujinx.Graphics.Texture.BlockLinearConstants;
 
@@ -93,7 +95,7 @@ namespace Ryujinx.Graphics.Texture
             };
         }
 
-        public static byte[] ConvertBlockLinearToLinear(
+        public static IMemoryOwner<byte> ConvertBlockLinearToLinear(
             int width,
             int height,
             int depth,
@@ -119,7 +121,8 @@ namespace Ryujinx.Graphics.Texture
                 blockHeight,
                 bytesPerPixel);
 
-            byte[] output = new byte[outSize];
+            IMemoryOwner<byte> outputOwner = ByteMemoryPool.Rent(outSize);
+            Span<byte> output = outputOwner.Memory.Span;
 
             int outOffs = 0;
 
@@ -243,10 +246,10 @@ namespace Ryujinx.Graphics.Texture
                     _ => throw new NotSupportedException($"Unable to convert ${bytesPerPixel} bpp pixel format."),
                 };
             }
-            return output;
+            return outputOwner;
         }
 
-        public static byte[] ConvertLinearStridedToLinear(
+        public static IMemoryOwner<byte> ConvertLinearStridedToLinear(
             int width,
             int height,
             int blockWidth,
@@ -262,8 +265,8 @@ namespace Ryujinx.Graphics.Texture
             int outStride = BitUtils.AlignUp(w * bytesPerPixel, HostStrideAlignment);
             lineSize = Math.Min(lineSize, outStride);
 
-            byte[] output = new byte[h * outStride];
-            Span<byte> outSpan = output;
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(h * outStride);
+            Span<byte> outSpan = output.Memory.Span;
 
             int outOffs = 0;
             int inOffs = 0;
diff --git a/ryujinx/src/Ryujinx.Graphics.Texture/PixelConverter.cs b/ryujinx/src/Ryujinx.Graphics.Texture/PixelConverter.cs
index 7955aed3f1..4475cc98aa 100644
--- a/ryujinx/src/Ryujinx.Graphics.Texture/PixelConverter.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Texture/PixelConverter.cs
@@ -1,5 +1,7 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Memory;
 using System;
+using System.Buffers;
 using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
@@ -19,13 +21,13 @@ namespace Ryujinx.Graphics.Texture
             return (remainder, outRemainder, length / stride);
         }
 
-        public unsafe static byte[] ConvertR4G4ToR4G4B4A4(ReadOnlySpan<byte> data, int width)
+        public unsafe static IMemoryOwner<byte> ConvertR4G4ToR4G4B4A4(ReadOnlySpan<byte> data, int width)
         {
-            byte[] output = new byte[data.Length * 2];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(data.Length * 2);
 
             (int remainder, int outRemainder, int height) = GetLineRemainders(data.Length, width, 1, 2);
 
-            Span<ushort> outputSpan = MemoryMarshal.Cast<byte, ushort>(output);
+            Span<ushort> outputSpan = MemoryMarshal.Cast<byte, ushort>(output.Memory.Span);
 
             if (remainder == 0)
             {
@@ -36,7 +38,7 @@ namespace Ryujinx.Graphics.Texture
                     int sizeTrunc = data.Length & ~7;
                     start = sizeTrunc;
 
-                    fixed (byte* inputPtr = data, outputPtr = output)
+                    fixed (byte* inputPtr = data, outputPtr = output.Memory.Span)
                     {
                         for (ulong offset = 0; offset < (ulong)sizeTrunc; offset += 8)
                         {
@@ -47,7 +49,7 @@ namespace Ryujinx.Graphics.Texture
 
                 for (int i = start; i < data.Length; i++)
                 {
-                    outputSpan[i] = (ushort)data[i];
+                    outputSpan[i] = data[i];
                 }
             }
             else
@@ -70,16 +72,16 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public unsafe static byte[] ConvertR5G6B5ToR8G8B8A8(ReadOnlySpan<byte> data, int width)
+        public static IMemoryOwner<byte> ConvertR5G6B5ToR8G8B8A8(ReadOnlySpan<byte> data, int width)
         {
-            byte[] output = new byte[data.Length * 2];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(data.Length * 2);
             int offset = 0;
             int outOffset = 0;
 
             (int remainder, int outRemainder, int height) = GetLineRemainders(data.Length, width, 2, 4);
 
             ReadOnlySpan<ushort> inputSpan = MemoryMarshal.Cast<byte, ushort>(data);
-            Span<uint> outputSpan = MemoryMarshal.Cast<byte, uint>(output);
+            Span<uint> outputSpan = MemoryMarshal.Cast<byte, uint>(output.Memory.Span);
 
             for (int y = 0; y < height; y++)
             {
@@ -107,16 +109,16 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public unsafe static byte[] ConvertR5G5B5ToR8G8B8A8(ReadOnlySpan<byte> data, int width, bool forceAlpha)
+        public static IMemoryOwner<byte> ConvertR5G5B5ToR8G8B8A8(ReadOnlySpan<byte> data, int width, bool forceAlpha)
         {
-            byte[] output = new byte[data.Length * 2];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(data.Length * 2);
             int offset = 0;
             int outOffset = 0;
 
             (int remainder, int outRemainder, int height) = GetLineRemainders(data.Length, width, 2, 4);
 
             ReadOnlySpan<ushort> inputSpan = MemoryMarshal.Cast<byte, ushort>(data);
-            Span<uint> outputSpan = MemoryMarshal.Cast<byte, uint>(output);
+            Span<uint> outputSpan = MemoryMarshal.Cast<byte, uint>(output.Memory.Span);
 
             for (int y = 0; y < height; y++)
             {
@@ -144,16 +146,16 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public unsafe static byte[] ConvertA1B5G5R5ToR8G8B8A8(ReadOnlySpan<byte> data, int width)
+        public static IMemoryOwner<byte> ConvertA1B5G5R5ToR8G8B8A8(ReadOnlySpan<byte> data, int width)
         {
-            byte[] output = new byte[data.Length * 2];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(data.Length * 2);
             int offset = 0;
             int outOffset = 0;
 
             (int remainder, int outRemainder, int height) = GetLineRemainders(data.Length, width, 2, 4);
 
             ReadOnlySpan<ushort> inputSpan = MemoryMarshal.Cast<byte, ushort>(data);
-            Span<uint> outputSpan = MemoryMarshal.Cast<byte, uint>(output);
+            Span<uint> outputSpan = MemoryMarshal.Cast<byte, uint>(output.Memory.Span);
 
             for (int y = 0; y < height; y++)
             {
@@ -181,16 +183,16 @@ namespace Ryujinx.Graphics.Texture
             return output;
         }
 
-        public unsafe static byte[] ConvertR4G4B4A4ToR8G8B8A8(ReadOnlySpan<byte> data, int width)
+        public static IMemoryOwner<byte> ConvertR4G4B4A4ToR8G8B8A8(ReadOnlySpan<byte> data, int width)
         {
-            byte[] output = new byte[data.Length * 2];
+            IMemoryOwner<byte> output = ByteMemoryPool.Rent(data.Length * 2);
             int offset = 0;
             int outOffset = 0;
 
             (int remainder, int outRemainder, int height) = GetLineRemainders(data.Length, width, 2, 4);
 
             ReadOnlySpan<ushort> inputSpan = MemoryMarshal.Cast<byte, ushort>(data);
-            Span<uint> outputSpan = MemoryMarshal.Cast<byte, uint>(output);
+            Span<uint> outputSpan = MemoryMarshal.Cast<byte, uint>(output.Memory.Span);
 
             for (int y = 0; y < height; y++)
             {
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
index a0299a3720..a0010e660e 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
@@ -3,6 +3,7 @@ using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
 using Silk.NET.Vulkan;
 using System;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using CompareOp = Ryujinx.Graphics.GAL.CompareOp;
@@ -216,7 +217,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         public void Initialize()
         {
-            Span<byte> dummyTextureData = stackalloc byte[4];
+            IMemoryOwner<byte> dummyTextureData = ByteMemoryPool.RentCleared(4);
             _dummyTexture.SetData(dummyTextureData);
         }
 
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/Effects/SmaaPostProcessingEffect.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/Effects/SmaaPostProcessingEffect.cs
index 259be9d649..08e07f256b 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/Effects/SmaaPostProcessingEffect.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/Effects/SmaaPostProcessingEffect.cs
@@ -174,8 +174,8 @@ namespace Ryujinx.Graphics.Vulkan.Effects
                 SwizzleComponent.Blue,
                 SwizzleComponent.Alpha);
 
-            var areaTexture = EmbeddedResources.Read("Ryujinx.Graphics.Vulkan/Effects/Textures/SmaaAreaTexture.bin");
-            var searchTexture = EmbeddedResources.Read("Ryujinx.Graphics.Vulkan/Effects/Textures/SmaaSearchTexture.bin");
+            var areaTexture = EmbeddedResources.ReadFileToRentedMemory("Ryujinx.Graphics.Vulkan/Effects/Textures/SmaaAreaTexture.bin");
+            var searchTexture = EmbeddedResources.ReadFileToRentedMemory("Ryujinx.Graphics.Vulkan/Effects/Textures/SmaaSearchTexture.bin");
 
             _areaTexture = _renderer.CreateTexture(areaInfo) as TextureView;
             _searchTexture = _renderer.CreateTexture(searchInfo) as TextureView;
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureBuffer.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureBuffer.cs
index 81e4788142..e0694b1979 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureBuffer.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureBuffer.cs
@@ -1,7 +1,7 @@
-using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL;
 using Silk.NET.Vulkan;
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using Format = Ryujinx.Graphics.GAL.Format;
 using VkFormat = Silk.NET.Vulkan.Format;
@@ -94,17 +94,21 @@ namespace Ryujinx.Graphics.Vulkan
             _bufferView = null;
         }
 
-        public void SetData(SpanOrArray<byte> data)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data)
         {
-            _gd.SetBufferData(_bufferHandle, _offset, data);
+            _gd.SetBufferData(_bufferHandle, _offset, data.Memory.Span);
+            data.Dispose();
         }
 
-        public void SetData(SpanOrArray<byte> data, int layer, int level)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data, int layer, int level)
         {
             throw new NotSupportedException();
         }
 
-        public void SetData(SpanOrArray<byte> data, int layer, int level, Rectangle<int> region)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data, int layer, int level, Rectangle<int> region)
         {
             throw new NotSupportedException();
         }
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureView.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureView.cs
index d918f965fa..f2aaf4693f 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureView.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureView.cs
@@ -1,7 +1,7 @@
-using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL;
 using Silk.NET.Vulkan;
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -702,19 +702,25 @@ namespace Ryujinx.Graphics.Vulkan
             return GetDataFromBuffer(result, size, result);
         }
 
-        public void SetData(SpanOrArray<byte> data)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data)
         {
-            SetData(data, 0, 0, Info.GetLayers(), Info.Levels, singleSlice: false);
+            SetData(data.Memory.Span, 0, 0, Info.GetLayers(), Info.Levels, singleSlice: false);
+            data.Dispose();
         }
 
-        public void SetData(SpanOrArray<byte> data, int layer, int level)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data, int layer, int level)
         {
-            SetData(data, layer, level, 1, 1, singleSlice: true);
+            SetData(data.Memory.Span, layer, level, 1, 1, singleSlice: true);
+            data.Dispose();
         }
 
-        public void SetData(SpanOrArray<byte> data, int layer, int level, Rectangle<int> region)
+        /// <inheritdoc/>
+        public void SetData(IMemoryOwner<byte> data, int layer, int level, Rectangle<int> region)
         {
-            SetData(data, layer, level, 1, 1, singleSlice: true, region);
+            SetData(data.Memory.Span, layer, level, 1, 1, singleSlice: true, region);
+            data.Dispose();
         }
 
         private void SetData(ReadOnlySpan<byte> data, int layer, int level, int layers, int levels, bool singleSlice, Rectangle<int>? region = null)
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/config.rs b/shadowsocks-rust/crates/shadowsocks-service/src/config.rs
index 11f614406d..46820e9453 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/src/config.rs
+++ b/shadowsocks-rust/crates/shadowsocks-service/src/config.rs
@@ -70,7 +70,14 @@ use serde::{Deserialize, Serialize};
 use shadowsocks::relay::socks5::Address;
 use shadowsocks::{
     config::{
-        ManagerAddr, Mode, ReplayAttackPolicy, ServerAddr, ServerConfig, ServerUser, ServerUserManager, ServerWeight,
+        ManagerAddr,
+        Mode,
+        ReplayAttackPolicy,
+        ServerAddr,
+        ServerConfig,
+        ServerUser,
+        ServerUserManager,
+        ServerWeight,
     },
     crypto::CipherKind,
     plugin::PluginConfig,
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/fake_dns/processor.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/fake_dns/processor.rs
index fb730ace54..9ea7074043 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/fake_dns/processor.rs
+++ b/shadowsocks-rust/crates/shadowsocks-service/src/local/fake_dns/processor.rs
@@ -6,7 +6,10 @@ use hickory_resolver::proto::{
     op::{header::MessageType, response_code::ResponseCode, Message, OpCode},
     rr::{
         rdata::{A, AAAA},
-        DNSClass, RData, Record, RecordType,
+        DNSClass,
+        RData,
+        Record,
+        RecordType,
     },
 };
 use log::{debug, trace};
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs
index 1460ae87c4..ebe3e12b7b 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs
+++ b/shadowsocks-rust/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs
@@ -35,7 +35,7 @@ use tokio::{
     time,
 };
 
-use crate::local::context::ServiceContext;
+use crate::{config::ServerInstanceConfig, local::context::ServiceContext};
 
 use super::{
     server_data::ServerIdent,
@@ -82,8 +82,9 @@ impl PingBalancerBuilder {
         }
     }
 
-    pub fn add_server(&mut self, server: ServerConfig) {
+    pub fn add_server(&mut self, server: ServerInstanceConfig) {
         let ident = ServerIdent::new(
+            self.context.clone(),
             server,
             self.max_server_rtt,
             self.check_interval * EXPECTED_CHECK_POINTS_IN_CHECK_WINDOW,
@@ -720,13 +721,14 @@ impl PingBalancer {
     }
 
     /// Reset servers in load balancer. Designed for auto-reloading configuration file.
-    pub async fn reset_servers(&self, servers: Vec<ServerConfig>) -> io::Result<()> {
+    pub async fn reset_servers(&self, servers: Vec<ServerInstanceConfig>) -> io::Result<()> {
         let old_context = self.inner.context.load();
 
         let servers = servers
             .into_iter()
             .map(|s| {
                 Arc::new(ServerIdent::new(
+                    old_context.context.clone(),
                     s,
                     old_context.max_server_rtt,
                     old_context.check_interval * EXPECTED_CHECK_POINTS_IN_CHECK_WINDOW,
@@ -811,7 +813,7 @@ impl PingChecker {
             self.context.context(),
             self.server.server_config(),
             &addr,
-            self.context.connect_opts_ref(),
+            self.server.connect_opts_ref(),
         )
         .await?;
         stream.write_all(GET_BODY).await?;
@@ -851,7 +853,7 @@ impl PingChecker {
             self.context.context(),
             self.server.server_config(),
             &addr,
-            self.context.connect_opts_ref(),
+            self.server.connect_opts_ref(),
         )
         .await?;
         stream.write_all(GET_BODY).await?;
@@ -896,10 +898,12 @@ impl PingChecker {
 
         let addr = Address::SocketAddress(SocketAddr::new(Ipv4Addr::new(8, 8, 8, 8).into(), 53));
 
-        let svr_cfg = self.server.server_config();
-
-        let client =
-            ProxySocket::connect_with_opts(self.context.context(), svr_cfg, self.context.connect_opts_ref()).await?;
+        let client = ProxySocket::connect_with_opts(
+            self.context.context(),
+            self.server.server_config(),
+            self.server.connect_opts_ref(),
+        )
+        .await?;
 
         let mut control = UdpSocketControlData::default();
         control.client_session_id = rand::random::<u64>();
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/loadbalancing/server_data.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/loadbalancing/server_data.rs
index ec58de23dd..f42fce1edd 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/loadbalancing/server_data.rs
+++ b/shadowsocks-rust/crates/shadowsocks-service/src/local/loadbalancing/server_data.rs
@@ -2,13 +2,18 @@
 
 use std::{
     fmt::{self, Debug},
-    sync::atomic::{AtomicU32, Ordering},
+    sync::{
+        atomic::{AtomicU32, Ordering},
+        Arc,
+    },
     time::Duration,
 };
 
-use shadowsocks::ServerConfig;
+use shadowsocks::{net::ConnectOpts, ServerConfig};
 use tokio::sync::Mutex;
 
+use crate::{config::ServerInstanceConfig, local::context::ServiceContext};
+
 use super::server_stat::{Score, ServerStat};
 
 /// Server's statistic score
@@ -61,25 +66,44 @@ impl Debug for ServerScore {
 pub struct ServerIdent {
     tcp_score: ServerScore,
     udp_score: ServerScore,
-    svr_cfg: ServerConfig,
+    svr_cfg: ServerInstanceConfig,
+    connect_opts: ConnectOpts,
 }
 
 impl ServerIdent {
     /// Create a `ServerIdent`
-    pub fn new(svr_cfg: ServerConfig, max_server_rtt: Duration, check_window: Duration) -> ServerIdent {
+    pub fn new(
+        context: Arc<ServiceContext>,
+        svr_cfg: ServerInstanceConfig,
+        max_server_rtt: Duration,
+        check_window: Duration,
+    ) -> ServerIdent {
+        #[allow(unused_mut)]
+        let mut connect_opts = context.connect_opts_ref().clone();
+
+        #[cfg(any(target_os = "linux", target_os = "android"))]
+        if let Some(fwmark) = svr_cfg.outbound_fwmark {
+            connect_opts.fwmark = Some(fwmark);
+        }
+
         ServerIdent {
-            tcp_score: ServerScore::new(svr_cfg.weight().tcp_weight(), max_server_rtt, check_window),
-            udp_score: ServerScore::new(svr_cfg.weight().udp_weight(), max_server_rtt, check_window),
+            tcp_score: ServerScore::new(svr_cfg.config.weight().tcp_weight(), max_server_rtt, check_window),
+            udp_score: ServerScore::new(svr_cfg.config.weight().udp_weight(), max_server_rtt, check_window),
             svr_cfg,
+            connect_opts,
         }
     }
 
+    pub fn connect_opts_ref(&self) -> &ConnectOpts {
+        &self.connect_opts
+    }
+
     pub fn server_config(&self) -> &ServerConfig {
-        &self.svr_cfg
+        &self.svr_cfg.config
     }
 
     pub fn server_config_mut(&mut self) -> &mut ServerConfig {
-        &mut self.svr_cfg
+        &mut self.svr_cfg.config
     }
 
     pub fn tcp_score(&self) -> &ServerScore {
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/mod.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/mod.rs
index 06c2adbd6a..e5ee61a52a 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/mod.rs
+++ b/shadowsocks-rust/crates/shadowsocks-service/src/local/mod.rs
@@ -226,7 +226,7 @@ impl Server {
             }
 
             for server in config.server {
-                balancer_builder.add_server(server.config);
+                balancer_builder.add_server(server);
             }
 
             balancer_builder.build().await?
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/net/udp/association.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/net/udp/association.rs
index 758db7d577..49b99671fd 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/net/udp/association.rs
+++ b/shadowsocks-rust/crates/shadowsocks-service/src/local/net/udp/association.rs
@@ -29,7 +29,9 @@ use shadowsocks::{
 use crate::{
     local::{context::ServiceContext, loadbalancing::PingBalancer},
     net::{
-        packet_window::PacketWindowFilter, MonProxySocket, UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
+        packet_window::PacketWindowFilter,
+        MonProxySocket,
+        UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
         UDP_ASSOCIATION_SEND_CHANNEL_SIZE,
     },
 };
diff --git a/shadowsocks-rust/crates/shadowsocks/src/net/sys/unix/others.rs b/shadowsocks-rust/crates/shadowsocks/src/net/sys/unix/others.rs
index e68ea86411..a8cf4c897b 100644
--- a/shadowsocks-rust/crates/shadowsocks/src/net/sys/unix/others.rs
+++ b/shadowsocks-rust/crates/shadowsocks/src/net/sys/unix/others.rs
@@ -14,7 +14,7 @@ use tokio::{
 };
 
 use crate::net::{
-    sys::{ErrorKind, set_common_sockopt_after_connect, set_common_sockopt_for_connect},
+    sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, ErrorKind},
     AcceptOpts,
     AddrFamily,
     ConnectOpts,
diff --git a/shadowsocks-rust/src/service/local.rs b/shadowsocks-rust/src/service/local.rs
index 4fad3670c1..c4ef99acfd 100644
--- a/shadowsocks-rust/src/service/local.rs
+++ b/shadowsocks-rust/src/service/local.rs
@@ -991,10 +991,13 @@ fn launch_reload_server_task(config_path: PathBuf, balancer: PingBalancer) {
                 }
             };
 
-            let servers: Vec<ServerConfig> = config.server.into_iter().map(|s| s.config).collect();
-            info!("auto-reload {} with {} servers", config_path.display(), servers.len());
+            info!(
+                "auto-reload {} with {} servers",
+                config_path.display(),
+                config.server.len()
+            );
 
-            if let Err(err) = balancer.reset_servers(servers).await {
+            if let Err(err) = balancer.reset_servers(config.server).await {
                 error!("auto-reload {} but found error: {}", config_path.display(), err);
             }
         }
diff --git a/small/chinadns-ng/Makefile b/small/chinadns-ng/Makefile
index e524022526..040d3d5c36 100644
--- a/small/chinadns-ng/Makefile
+++ b/small/chinadns-ng/Makefile
@@ -3,33 +3,33 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chinadns-ng
-PKG_VERSION:=2024.03.27
+PKG_VERSION:=2024.04.13
 PKG_RELEASE:=1
 
 ifeq ($(ARCH),aarch64)
   PKG_ARCH:=chinadns-ng@aarch64-linux-musl@generic+v8a@fast+lto
-  PKG_HASH:=5255a5393d0923ca378f1076eefa8719ab301b25398ab0280e026cdc6316b0e4
+  PKG_HASH:=dddbfcde000d4178fee2f8cdcfec7f10f8deb1f6673f9046b35d340dd2182ac5
 else ifeq ($(ARCH),arm)
   ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
   ifeq ($(ARM_CPU_FEATURES),)
     PKG_ARCH:=chinadns-ng@arm-linux-musleabi@generic+v6+soft_float@fast+lto
-    PKG_HASH:=f9e597bbc060d7c5e19c837a3c0b3118f91c986f29ee7f55a23ace321aca1731
+    PKG_HASH:=08fb1ae28eeb41ff48e9fd3b0dea3f58111885f1a39acea91978a883fb3d62ed
   else
     PKG_ARCH:=chinadns-ng@arm-linux-musleabihf@generic+v7a@fast+lto
-    PKG_HASH:=d065c7d55b6c43b20dbb668d7bdafabe371c3360cc75bd0279cc2d7a83e342e9
+    PKG_HASH:=2653bc82f8ae622e793c28933da55321aef82e8b923df9fd3cedb72f3f34fa90
   endif
 else ifeq ($(ARCH),mips)
   PKG_ARCH:=chinadns-ng@mips-linux-musl@mips32+soft_float@fast+lto
-  PKG_HASH:=2170011ecf8ee29057d805eb8054bcc4366b759f454c063f0a258c84403e416e
+  PKG_HASH:=0245d23021867461524398b1074fc13abf8aae56ae93faa1ecd78b1bda6b5d76
 else ifeq ($(ARCH),mipsel)
   PKG_ARCH:=chinadns-ng@mipsel-linux-musl@mips32+soft_float@fast+lto
-  PKG_HASH:=9ac1462187b3b06173f908295d45fd0fa3e37eb50171e22198e29dd81710b268
+  PKG_HASH:=15845a0b03deba4e407dda963d60f47623e93fdf5d0e9ab0f83baa25be0bb36f
 else ifeq ($(ARCH),i386)
   PKG_ARCH:=chinadns-ng@i386-linux-musl@i686@fast+lto
-  PKG_HASH:=bf22fb35fba5e9b1174b0334a5473d4db8b3f85e489cec5af94f9a92f7c9787b
+  PKG_HASH:=5bfdf006971be9c96f59c797c554972337197aaf5d9b6d8402da61738147653d
 else ifeq ($(ARCH),x86_64)
   PKG_ARCH:=chinadns-ng@x86_64-linux-musl@x86_64@fast+lto
-  PKG_HASH:=8adf68d15068a3a27588772deb19be0a9804077a075aa8dad9dafa12a154c529
+  PKG_HASH:=af11c02a80f5b7db69832c86a15126adf822d54e8f0aa38bb1d88f75449180bc
 else
   PKG_HASH:=dummy
 endif
diff --git a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
index 44b29af29a..280d03caac 100644
--- a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
+++ b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
@@ -568,6 +568,7 @@ o.rmempty = true
 
 -- Tuic settings for the local inbound socks5 server
 o = s:option(Flag, "tuic_dual_stack", translate("Dual-stack Listening Socket"))
+o.description = translate("If this option is not set, the socket behavior is platform dependent.")
 o:depends("type", "tuic")
 o.default = "0"
 o.rmempty = true
@@ -941,7 +942,8 @@ o:depends("reality", true)
 o.rmempty = true
 
 o = s:option(DynamicList, "tls_alpn", translate("TLS ALPN"))
-o:depends({type = "tuic", tls = true})
+o:depends("type", "tuic")
+o.default = "h3"
 o.rmempty = true
 
 -- [[ allowInsecure ]]--
diff --git a/small/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/small/luci-app-ssr-plus/po/zh-cn/ssr-plus.po
index 632b5c9e44..7d9f13bfa7 100644
--- a/small/luci-app-ssr-plus/po/zh-cn/ssr-plus.po
+++ b/small/luci-app-ssr-plus/po/zh-cn/ssr-plus.po
@@ -1050,6 +1050,9 @@ msgstr "接收窗口（无需确认即可接收的最大字节数：默认8Mb）
 msgid "Dual-stack Listening Socket"
 msgstr "双栈Socket监听"
 
+msgid "If this option is not set, the socket behavior is platform dependent."
+msgstr "如果未设置此选项，则套接字行为依赖于平台。"
+
 msgid "Maximum packet size the socks5 server can receive from external"
 msgstr "socks5服务器可以从外部接收的最大数据包大小（单位：字节）"
 
diff --git a/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
index b07949e5f1..877d955408 100755
--- a/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
+++ b/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
@@ -476,8 +476,8 @@ local tuic = {
 			receive_window = tonumber(server.receive_window)
 		},
 		["local"] = {
-			server = tonumber(socks_port) and (server.tuic_dual_stack == "1" and "[::1]:" or "127.0.0.1:")  .. (socks_port == "0" and local_port or tonumber(socks_port)),
-			dual_stack = (server.tuic_dual_stack == "1") and true or false,
+			server = tonumber(socks_port) and "[::]:" .. (socks_port == "0" and local_port or tonumber(socks_port)),
+			dual_stack = (server.tuic_dual_stack == "1") and true  or nil,
 			max_packet_size = tonumber(server.tuic_max_package_size)
 		}
 }
diff --git a/v2raya/Dockerfile.dev b/v2raya/Dockerfile.dev
index 978b6f11df..3b4b1d1d67 100644
--- a/v2raya/Dockerfile.dev
+++ b/v2raya/Dockerfile.dev
@@ -5,9 +5,9 @@ FROM golang:alpine
 RUN apk --no-cache add iptables ip6tables git
 ENV GO111MODULE=on
 ENV GOPROXY=https://goproxy.cn
-RUN go get github.com/codegangsta/gin
+RUN go install github.com/codegangsta/gin@latest
 WORKDIR /service
-COPY --from=v2ray /usr/bin/v2ray /usr/bin/v2ctl /usr/share/v2ray/
+COPY --from=v2ray /usr/bin/v2ray /usr/share/v2ray/
 COPY --from=v2ray /usr/local/share/v2ray/* /usr/local/share/v2ray/
 ENV PATH=$PATH:/usr/share/v2ray
 ENV CONFIG=../config.json
diff --git a/v2raya/build.sh b/v2raya/build.sh
index 2313276ebe..a27f7ec913 100755
--- a/v2raya/build.sh
+++ b/v2raya/build.sh
@@ -13,4 +13,4 @@ else
 fi
 # https://github.com/webpack/webpack/issues/14532#issuecomment-947012063
 cd "$CurrentDir"/gui && yarn && OUTPUT_DIR="$CurrentDir"/service/server/router/web yarn build
-cd "$CurrentDir"/service && CGO_ENABLED=0 go build -ldflags "-X github.com/v2rayA/v2rayA/conf.Version=$version -s -w" -o "$CurrentDir"/v2raya
+cd "$CurrentDir"/service && CGO_ENABLED=0 go build -tags "with_gvisor" -ldflags "-X github.com/v2rayA/v2rayA/conf.Version=$version -s -w" -o "$CurrentDir"/v2raya
\ No newline at end of file
diff --git a/v2raya/gui/src/components/modalSetting.vue b/v2raya/gui/src/components/modalSetting.vue
index 711d1908ff..262d59baec 100644
--- a/v2raya/gui/src/components/modalSetting.vue
+++ b/v2raya/gui/src/components/modalSetting.vue
@@ -32,7 +32,6 @@
         }}</span>
         <b-button
           size="is-small"
-          type="is-text"
           style="
             position: relative;
             top: -2px;
@@ -121,6 +120,8 @@
         <b-select v-model="transparentType" expanded class="left-border">
           <option v-show="!lite" value="redirect">redirect</option>
           <option v-show="!lite" value="tproxy">tproxy</option>
+          <option v-show="!lite" value="gvisor_tun">gvisor tun</option>
+          <option v-show="!lite" value="system_tun">system tun</option>
           <option value="system_proxy">system proxy</option>
         </b-select>
       </b-field>
diff --git a/v2raya/service/core/coreObj/coreObj.go b/v2raya/service/core/coreObj/coreObj.go
index 01359d8582..45fc601d49 100644
--- a/v2raya/service/core/coreObj/coreObj.go
+++ b/v2raya/service/core/coreObj/coreObj.go
@@ -175,6 +175,7 @@ type Mux struct {
 type OutboundObject struct {
 	Tag            string          `json:"tag"`
 	Protocol       string          `json:"protocol"`
+	SendThrough    string          `json:"sendThrough,omitempty"`
 	Settings       Settings        `json:"settings,omitempty"`
 	StreamSettings *StreamSettings `json:"streamSettings,omitempty"`
 	ProxySettings  *ProxySettings  `json:"proxySettings,omitempty"`
diff --git a/v2raya/service/core/dns/dns.go b/v2raya/service/core/dns/dns.go
new file mode 100644
index 0000000000..3da2db6f68
--- /dev/null
+++ b/v2raya/service/core/dns/dns.go
@@ -0,0 +1,5 @@
+package dns
+
+import "net/netip"
+
+var defaultDNS = []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:53"), netip.MustParseAddrPort("[::1]:53")}
diff --git a/v2raya/service/core/dns/dns_unix.go b/v2raya/service/core/dns/dns_unix.go
new file mode 100644
index 0000000000..8220dfe9e6
--- /dev/null
+++ b/v2raya/service/core/dns/dns_unix.go
@@ -0,0 +1,67 @@
+//go:build !js && !windows
+
+package dns
+
+import (
+	"bufio"
+	"net/netip"
+	"os"
+	"strings"
+)
+
+func GetSystemDNS() (servers []netip.AddrPort) {
+	f, err := os.Open("/etc/resolv.conf")
+	if err != nil {
+		return defaultDNS
+	}
+	defer f.Close()
+	scanner := bufio.NewScanner(f)
+	for scanner.Scan() {
+		line := scanner.Text()
+		f := getFields(line)
+		if len(f) < 1 {
+			continue
+		}
+		switch f[0] {
+		case "nameserver":
+			if len(f) > 1 {
+				if addr, err := netip.ParseAddr(f[1]); err == nil {
+					servers = append(servers, netip.AddrPortFrom(addr, 53))
+				}
+			}
+		}
+	}
+	return
+}
+
+func countAnyByte(s string, t string) int {
+	n := 0
+	for i := 0; i < len(s); i++ {
+		if strings.IndexByte(t, s[i]) >= 0 {
+			n++
+		}
+	}
+	return n
+}
+
+func splitAtBytes(s string, t string) []string {
+	a := make([]string, 1+countAnyByte(s, t))
+	n := 0
+	last := 0
+	for i := 0; i < len(s); i++ {
+		if strings.IndexByte(t, s[i]) >= 0 {
+			if last < i {
+				a[n] = s[last:i]
+				n++
+			}
+			last = i + 1
+		}
+	}
+	if last < len(s) {
+		a[n] = s[last:]
+		n++
+	}
+	return a[0:n]
+}
+
+func getFields(s string) []string { return splitAtBytes(s, " \r\t\n") }
diff --git a/v2raya/service/core/dns/dns_windows.go b/v2raya/service/core/dns/dns_windows.go
new file mode 100644
index 0000000000..7ed24604e4
--- /dev/null
+++ b/v2raya/service/core/dns/dns_windows.go
@@ -0,0 +1,68 @@
+package dns
+
+import (
+	"net/netip"
+	"os"
+	"syscall"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+)
+
+func GetSystemDNS() (servers []netip.AddrPort) {
+	aas, err := adapterAddresses()
+	if err != nil {
+		return defaultDNS
+	}
+	for _, aa := range aas {
+		for dns := aa.FirstDnsServerAddress; dns != nil; dns = dns.Next {
+			if aa.OperStatus != windows.IfOperStatusUp {
+				continue
+			}
+			sa, err := dns.Address.Sockaddr.Sockaddr()
+			if err != nil {
+				continue
+			}
+			var addr netip.Addr
+			switch sa := sa.(type) {
+			case *syscall.SockaddrInet4:
+				addr = netip.AddrFrom4(sa.Addr)
+			case *syscall.SockaddrInet6:
+				if sa.Addr[0] == 0xfe && sa.Addr[1] == 0xc0 {
+					continue
+				}
+				addr = netip.AddrFrom16(sa.Addr)
+			default:
+				continue
+			}
+			servers = append(servers, netip.AddrPortFrom(addr, 53))
+		}
+	}
+	return
+}
+
+func adapterAddresses() ([]*windows.IpAdapterAddresses, error) {
+	var b []byte
+	l := uint32(15000)
+	for {
+		b = make([]byte, l)
+		err := windows.GetAdaptersAddresses(syscall.AF_UNSPEC, windows.GAA_FLAG_INCLUDE_PREFIX, 0, (*windows.IpAdapterAddresses)(unsafe.Pointer(&b[0])), &l)
+		if err == nil {
+			if l == 0 {
+				return nil, nil
+			}
+			break
+		}
+		if err.(syscall.Errno) != syscall.ERROR_BUFFER_OVERFLOW {
+			return nil, os.NewSyscallError("getadaptersaddresses", err)
+		}
+		if l <= uint32(len(b)) {
+			return nil, os.NewSyscallError("getadaptersaddresses", err)
+		}
+	}
+	var aas []*windows.IpAdapterAddresses
+	for aa := (*windows.IpAdapterAddresses)(unsafe.Pointer(&b[0])); aa != nil; aa = aa.Next {
+		aas = append(aas, aa)
+	}
+	return aas, nil
+}
diff --git a/v2raya/service/core/dns/system_darwin.go b/v2raya/service/core/dns/system_darwin.go
new file mode 100644
index 0000000000..eb96f7d450
--- /dev/null
+++ b/v2raya/service/core/dns/system_darwin.go
@@ -0,0 +1,88 @@
+package dns
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"net/netip"
+	"os/exec"
+	"strings"
+)
+
+const networksetup = "/usr/sbin/networksetup"
+
+func GetValidNetworkInterfaces() ([]string, error) {
+	cmd := exec.Command(networksetup, "-listallnetworkservices")
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return nil, fmt.Errorf("networksetup get: %v", err)
+	}
+	var interfaces []string
+	scanner := bufio.NewScanner(bytes.NewReader(output))
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.Contains(line, "*") {
+			continue
+		}
+		cmd = exec.Command(networksetup, "-getinfo", line)
+		output, err = cmd.CombinedOutput()
+		if err != nil {
+			continue
+		}
+		valid := false
+		scanner2 := bufio.NewScanner(bytes.NewReader(output))
+		for scanner2.Scan() {
+			line2 := scanner2.Text()
+			key, value, ok := strings.Cut(line2, ": ")
+			if !ok {
+				continue
+			}
+			if key == "IP address" || key == "IPv6 IP address" {
+				if _, err = netip.ParseAddr(value); err == nil {
+					valid = true
+					break
+				}
+			}
+		}
+		if valid {
+			interfaces = append(interfaces, line)
+		}
+	}
+	return interfaces, nil
+}
+
+func GetDNSServer(ifi string) ([]string, error) {
+	cmd := exec.Command(networksetup, "-getdnsservers", ifi)
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return nil, fmt.Errorf("networksetup get: %v", err)
+	}
+	var server []string
+	scanner := bufio.NewScanner(bytes.NewReader(output))
+	for scanner.Scan() {
+		line := scanner.Text()
+		if _, err = netip.ParseAddr(line); err == nil {
+			server = append(server, line)
+		}
+	}
+	return server, nil
+}
+
+func SetDNSServer(ifi string, server ...string) error {
+	cmd := exec.Command(networksetup, "-setdnsservers", ifi)
+	if len(server) == 0 {
+		cmd.Args = append(cmd.Args, "Empty")
+	} else {
+		cmd.Args = append(cmd.Args, server...)
+	}
+	_, err := cmd.CombinedOutput()
+	return err
+}
+
+func ReplaceDNSServer(ifi string, server ...string) ([]string, error) {
+	old, err := GetDNSServer(ifi)
+	if err != nil {
+		return nil, err
+	}
+	return old, SetDNSServer(ifi, server...)
+}
diff --git a/v2raya/service/core/dns/system_other.go b/v2raya/service/core/dns/system_other.go
new file mode 100644
index 0000000000..41e0754a3a
--- /dev/null
+++ b/v2raya/service/core/dns/system_other.go
@@ -0,0 +1,21 @@
+//go:build !windows && !darwin
+
+package dns
+
+import "errors"
+
+func GetValidNetworkInterfaces() ([]string, error) {
+	return nil, errors.New("not implemented")
+}
+
+func GetDNSServer(ifi string) ([]string, error) {
+	return nil, errors.New("not implemented")
+}
+
+func SetDNSServer(ifi string, server ...string) error {
+	return errors.New("not implemented")
+}
+
+func ReplaceDNSServer(ifi string, server ...string) ([]string, error) {
+	return nil, errors.New("not implemented")
+}
diff --git a/v2raya/service/core/dns/system_windows.go b/v2raya/service/core/dns/system_windows.go
new file mode 100644
index 0000000000..8889a3999f
--- /dev/null
+++ b/v2raya/service/core/dns/system_windows.go
@@ -0,0 +1,71 @@
+package dns
+
+import (
+	"errors"
+	"strings"
+
+	"golang.org/x/sys/windows/registry"
+)
+
+const basePath = `SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\`
+
+func GetValidNetworkInterfaces() ([]string, error) {
+	key, err := registry.OpenKey(registry.LOCAL_MACHINE, basePath, registry.ENUMERATE_SUB_KEYS)
+	if err != nil {
+		return nil, err
+	}
+	defer key.Close()
+	names, err := key.ReadSubKeyNames(0)
+	if err != nil {
+		return nil, err
+	}
+	var interfaces []string
+	for _, name := range names {
+		key, err = registry.OpenKey(registry.LOCAL_MACHINE, basePath+name, registry.READ)
+		if err != nil {
+			continue
+		}
+		if ip, _, _ := key.GetStringsValue("IPAddress"); len(ip) != 0 {
+			interfaces = append(interfaces, name)
+		} else if ip, _, _ := key.GetStringValue("DhcpIPAddress"); ip != "" {
+			interfaces = append(interfaces, name)
+		}
+		key.Close()
+	}
+	return interfaces, nil
+}
+
+func GetDNSServer(ifi string) ([]string, error) {
+	key, err := registry.OpenKey(registry.LOCAL_MACHINE, basePath+ifi, registry.READ)
+	if err != nil {
+		return nil, err
+	}
+	defer key.Close()
+	server, _, err := key.GetStringValue("NameServer")
+	if err != nil && !errors.Is(err, registry.ErrNotExist) {
+		return nil, err
+	}
+	return strings.Split(server, ","), nil
+}
+
+func SetDNSServer(ifi string, server ...string) error {
+	key, err := registry.OpenKey(registry.LOCAL_MACHINE, basePath+ifi, registry.WRITE)
+	if err != nil {
+		return err
+	}
+	defer key.Close()
+	return key.SetStringValue("NameServer", strings.Join(server, ","))
+}
+
+func ReplaceDNSServer(ifi string, server ...string) ([]string, error) {
+	key, err := registry.OpenKey(registry.LOCAL_MACHINE, basePath+ifi, registry.READ|registry.WRITE)
+	if err != nil {
+		return nil, err
+	}
+	defer key.Close()
+	value, _, err := key.GetStringValue("NameServer")
+	if err != nil && !errors.Is(err, registry.ErrNotExist) {
+		return nil, err
+	}
+	return strings.Split(value, ","), key.SetStringValue("NameServer", strings.Join(server, ","))
+}
diff --git a/v2raya/service/core/tun/cache.go b/v2raya/service/core/tun/cache.go
new file mode 100644
index 0000000000..260836517a
--- /dev/null
+++ b/v2raya/service/core/tun/cache.go
@@ -0,0 +1,78 @@
+package tun
+
+import (
+	"sync"
+	"time"
+)
+
+type cacheItem[T any] struct {
+	expires time.Time
+	data    T
+}
+
+type cache[K comparable, V any] struct {
+	sync.RWMutex
+	cache map[K]*cacheItem[V]
+}
+
+func newCache[K comparable, V any]() *cache[K, V] {
+	return &cache[K, V]{
+		cache: make(map[K]*cacheItem[V]),
+	}
+}
+
+func (c *cache[K, V]) Check() {
+	c.Lock()
+	c.UnsafeCheck()
+	c.Unlock()
+}
+
+func (c *cache[K, V]) Contains(key K) bool {
+	c.RLock()
+	_, ok := c.cache[key]
+	c.RUnlock()
+	return ok
+}
+
+func (c *cache[K, V]) Load(key K) (value V, ok bool) {
+	c.RLock()
+	value, ok = c.UnsafeLoad(key)
+	c.RUnlock()
+	return
+}
+
+func (c *cache[K, V]) Store(key K, value V, ttl time.Duration) {
+	c.Lock()
+	c.UnsafeStore(key, value, ttl)
+	c.Unlock()
+}
+
+func (c *cache[K, V]) UnsafeCheck() {
+	now := time.Now()
+	for k, v := range c.cache {
+		if now.After(v.expires) {
+			delete(c.cache, k)
+		}
+	}
+}
+
+func (c *cache[K, V]) UnsafeContains(key K) bool {
+	_, ok := c.cache[key]
+	return ok
+}
+
+func (c *cache[K, V]) UnsafeLoad(key K) (value V, ok bool) {
+	var item *cacheItem[V]
+	item, ok = c.cache[key]
+	if ok {
+		value = item.data
+	}
+	return
+}
+
+func (c *cache[K, V]) UnsafeStore(key K, value V, ttl time.Duration) {
+	c.cache[key] = &cacheItem[V]{
+		expires: time.Now().Add(ttl),
+		data:    value,
+	}
+}
diff --git a/v2raya/service/core/tun/closer.go b/v2raya/service/core/tun/closer.go
new file mode 100644
index 0000000000..5b11889483
--- /dev/null
+++ b/v2raya/service/core/tun/closer.go
@@ -0,0 +1,12 @@
+package tun
+
+import "io"
+
+type Closer []io.Closer
+
+func (c Closer) Close() error {
+	for i := len(c) - 1; i >= 0; i-- {
+		c[i].Close()
+	}
+	return nil
+}
diff --git a/v2raya/service/core/tun/dns.go b/v2raya/service/core/tun/dns.go
new file mode 100644
index 0000000000..2d9ae7d0f6
--- /dev/null
+++ b/v2raya/service/core/tun/dns.go
@@ -0,0 +1,475 @@
+package tun
+
+import (
+	"context"
+	"crypto/rand"
+	"encoding/binary"
+	"errors"
+	"math/big"
+	"net"
+	"net/netip"
+	"strings"
+	"time"
+
+	D "github.com/miekg/dns"
+	"github.com/sagernet/sing/common/buf"
+	"github.com/sagernet/sing/common/bufio"
+	M "github.com/sagernet/sing/common/metadata"
+	N "github.com/sagernet/sing/common/network"
+)
+
+const (
+	DNSTimeout = 10 * time.Second
+	FakeTTL    = 5 * time.Minute
+
+	FixedPacketSize = 16384
+)
+
+const (
+	dnsDirect = iota
+	dnsForward
+	dnsFake4
+	dnsFake6
+)
+
+var (
+	fakePrefix4 = netip.MustParsePrefix("198.18.0.0/15")
+	fakePrefix6 = netip.MustParsePrefix("fc00::/18")
+
+	defaultDNSServer = M.ParseSocksaddrHostPort("1.1.1.1", 53)
+)
+
+type DNS struct {
+	dialer       N.Dialer
+	forward      N.Dialer
+	addr         M.Socksaddr
+	whitelist    Matcher
+	servers      []M.Socksaddr
+	cache        *cache[netip.Addr, string]
+	currentIP4   netip.Addr
+	currentIP6   netip.Addr
+	fakeCache    *cache[netip.Addr, string]
+	domainCache4 *cache[string, netip.Addr]
+	domainCache6 *cache[string, netip.Addr]
+}
+
+func NewDNS(dialer, forward N.Dialer, addr M.Socksaddr) *DNS {
+	return &DNS{
+		dialer:       dialer,
+		forward:      forward,
+		addr:         addr,
+		cache:        newCache[netip.Addr, string](),
+		currentIP4:   fakePrefix4.Addr().Next(),
+		currentIP6:   fakePrefix6.Addr().Next(),
+		fakeCache:    newCache[netip.Addr, string](),
+		domainCache4: newCache[string, netip.Addr](),
+		domainCache6: newCache[string, netip.Addr](),
+	}
+}
+
+func (d *DNS) NewConnection(ctx context.Context, conn net.Conn, metadata M.Metadata) error {
+	d.fakeCache.Check()
+	if metadata.Destination != d.addr {
+		return continueHandler
+	}
+	ctx, cancel := context.WithCancelCause(ctx)
+	go func() {
+		for {
+			var queryLength uint16
+			err := binary.Read(conn, binary.BigEndian, &queryLength)
+			if err != nil {
+				cancel(err)
+				return
+			}
+			if queryLength == 0 {
+				cancel(errors.New("format error"))
+				return
+			}
+			buffer := buf.NewSize(int(queryLength))
+			defer buffer.Release()
+			_, err = buffer.ReadFullFrom(conn, int(queryLength))
+			if err != nil {
+				cancel(err)
+				return
+			}
+			var message D.Msg
+			err = message.Unpack(buffer.Bytes())
+			if err != nil {
+				cancel(err)
+				return
+			}
+			go func() {
+				response, err := d.Exchange(ctx, &message)
+				if err != nil {
+					cancel(err)
+					return
+				}
+				responseBuffer := buf.NewPacket()
+				defer responseBuffer.Release()
+				responseBuffer.Resize(2, 0)
+				n, err := response.PackBuffer(responseBuffer.FreeBytes())
+				if err != nil {
+					cancel(err)
+					return
+				}
+				responseBuffer.Truncate(len(n))
+				binary.BigEndian.PutUint16(responseBuffer.ExtendHeader(2), uint16(len(n)))
+				_, err = conn.Write(responseBuffer.Bytes())
+				if err != nil {
+					cancel(err)
+				}
+			}()
+		}
+	}()
+	<-ctx.Done()
+	cancel(nil)
+	conn.Close()
+	return ctx.Err()
+}
+
+func (d *DNS) NewPacketConnection(ctx context.Context, conn N.PacketConn, metadata M.Metadata) error {
+	d.fakeCache.Check()
+	if metadata.Destination != d.addr {
+		return continueHandler
+	}
+	var reader N.PacketReader = conn
+	var counters []N.CountFunc
+	var cachedPackets []*N.PacketBuffer
+	for {
+		reader, counters = N.UnwrapCountPacketReader(reader, counters)
+		if cachedReader, isCached := reader.(N.CachedPacketReader); isCached {
+			packet := cachedReader.ReadCachedPacket()
+			if packet != nil {
+				cachedPackets = append(cachedPackets, packet)
+				continue
+			}
+		}
+		if readWaiter, created := bufio.CreatePacketReadWaiter(reader); created {
+			return d.newPacketConnection(ctx, conn, readWaiter, counters, cachedPackets, metadata)
+		}
+		break
+	}
+	ctx, cancel := context.WithCancelCause(ctx)
+	go func() {
+		for {
+			var message D.Msg
+			var destination M.Socksaddr
+			var err error
+			if len(cachedPackets) > 0 {
+				packet := cachedPackets[0]
+				cachedPackets = cachedPackets[1:]
+				for _, counter := range counters {
+					counter(int64(packet.Buffer.Len()))
+				}
+				err = message.Unpack(packet.Buffer.Bytes())
+				packet.Buffer.Release()
+				if err != nil {
+					cancel(err)
+					return
+				}
+				destination = packet.Destination
+			} else {
+				timeout := time.AfterFunc(DNSTimeout, func() {
+					cancel(context.DeadlineExceeded)
+				})
+				buffer := buf.NewPacket()
+				destination, err = conn.ReadPacket(buffer)
+				if err != nil {
+					buffer.Release()
+					cancel(err)
+					return
+				}
+				for _, counter := range counters {
+					counter(int64(buffer.Len()))
+				}
+				err = message.Unpack(buffer.Bytes())
+				buffer.Release()
+				if err != nil {
+					cancel(err)
+					return
+				}
+				timeout.Stop()
+			}
+			go func() {
+				response, err := d.Exchange(ctx, &message)
+				if err != nil {
+					cancel(err)
+					return
+				}
+				responseBuffer := buf.NewPacket()
+				n, err := response.PackBuffer(responseBuffer.FreeBytes())
+				if err != nil {
+					cancel(err)
+					responseBuffer.Release()
+					return
+				}
+				responseBuffer.Truncate(len(n))
+				err = conn.WritePacket(responseBuffer, destination)
+				if err != nil {
+					cancel(err)
+				}
+			}()
+		}
+	}()
+	<-ctx.Done()
+	cancel(nil)
+	conn.Close()
+	return ctx.Err()
+}
+
+func (d *DNS) Exchange(ctx context.Context, msg *D.Msg) (*D.Msg, error) {
+	if len(msg.Question) != 1 {
+		return d.newResponse(msg, D.RcodeFormatError), nil
+	}
+	mode := dnsDirect
+	if len(d.servers) == 0 {
+		mode = dnsForward
+	}
+	question := msg.Question[0]
+	domain := strings.TrimSuffix(question.Name, ".")
+	if !d.whitelist.Match(domain) {
+		switch question.Qtype {
+		case D.TypeA:
+			mode = dnsFake4
+		case D.TypeAAAA:
+			return d.newResponse(msg, D.RcodeSuccess), nil
+			mode = dnsFake6
+		case D.TypeMX, D.TypeHTTPS:
+			return d.newResponse(msg, D.RcodeSuccess), nil
+		}
+	}
+	var dialer N.Dialer
+	server := defaultDNSServer
+	switch mode {
+	case dnsDirect:
+		dialer = d.dialer
+		server = d.getServer()
+	case dnsForward:
+		dialer = d.forward
+	case dnsFake4:
+		addr, ok := d.getAvailableIP4(domain)
+		if ok {
+			return d.newResponse(msg, D.RcodeSuccess, addr), nil
+		}
+		dialer = d.forward
+	case dnsFake6:
+		if addr, ok := d.getAvailableIP6(domain); ok {
+			return d.newResponse(msg, D.RcodeSuccess, addr), nil
+		}
+		dialer = d.forward
+	}
+	if dialer != nil {
+		buffer := make([]byte, 1024)
+		data, err := msg.PackBuffer(buffer)
+		if err != nil {
+			return d.newResponse(msg, D.RcodeFormatError), nil
+		}
+		resp, err := func() (*D.Msg, error) {
+			serverConn, err := dialer.ListenPacket(ctx, server)
+			if err != nil {
+				return nil, err
+			}
+			defer serverConn.Close()
+			serverConn.SetDeadline(time.Now().Add(DNSTimeout))
+			_, err = serverConn.WriteTo(data, server.UDPAddr())
+			if err != nil {
+				return nil, err
+			}
+			n, _, err := serverConn.ReadFrom(buffer)
+			if err != nil {
+				return nil, err
+			}
+			var resp D.Msg
+			err = resp.Unpack(buffer[:n])
+			if err != nil {
+				return nil, err
+			}
+			return &resp, nil
+		}()
+		if err != nil {
+			return d.newResponse(msg, D.RcodeServerFailure), nil
+		}
+		return resp, nil
+	}
+	return d.newResponse(msg, D.RcodeRefused), nil
+}
+
+func (d *DNS) newPacketConnection(ctx context.Context, conn N.PacketConn, readWaiter N.PacketReadWaiter, readCounters []N.CountFunc, cached []*N.PacketBuffer, metadata M.Metadata) error {
+	ctx, cancel := context.WithCancelCause(ctx)
+	go func() {
+		var buffer *buf.Buffer
+		readWaiter.InitializeReadWaiter(func() *buf.Buffer {
+			buffer = buf.NewSize(FixedPacketSize)
+			buffer.FullReset()
+			return buffer
+		})
+		defer readWaiter.InitializeReadWaiter(nil)
+		for {
+			var message D.Msg
+			var destination M.Socksaddr
+			var err error
+			if len(cached) > 0 {
+				packet := cached[0]
+				cached = cached[1:]
+				for _, counter := range readCounters {
+					counter(int64(packet.Buffer.Len()))
+				}
+				err = message.Unpack(packet.Buffer.Bytes())
+				packet.Buffer.Release()
+				if err != nil {
+					cancel(err)
+					return
+				}
+				destination = packet.Destination
+			} else {
+				timeout := time.AfterFunc(DNSTimeout, func() {
+					cancel(context.DeadlineExceeded)
+				})
+				destination, err = readWaiter.WaitReadPacket()
+				if err != nil {
+					buffer.Release()
+					cancel(err)
+					return
+				}
+				for _, counter := range readCounters {
+					counter(int64(buffer.Len()))
+				}
+				err = message.Unpack(buffer.Bytes())
+				buffer.Release()
+				if err != nil {
+					cancel(err)
+					return
+				}
+				timeout.Stop()
+			}
+			go func() {
+				response, err := d.Exchange(ctx, &message)
+				if err != nil {
+					cancel(err)
+					return
+				}
+				responseBuffer := buf.NewPacket()
+				n, err := response.PackBuffer(responseBuffer.FreeBytes())
+				if err != nil {
+					cancel(err)
+					responseBuffer.Release()
+					return
+				}
+				responseBuffer.Truncate(len(n))
+				err = conn.WritePacket(responseBuffer, destination)
+				if err != nil {
+					cancel(err)
+				}
+			}()
+		}
+	}()
+	<-ctx.Done()
+	cancel(nil)
+	conn.Close()
+	return ctx.Err()
+}
+
+func (d *DNS) newResponse(msg *D.Msg, code int, answer ...netip.Addr) *D.Msg {
+	resp := D.Msg{
+		MsgHdr: D.MsgHdr{
+			Id:       msg.Id,
+			Response: true,
+			Rcode:    code,
+		},
+		Question: msg.Question,
+	}
+	for _, addr := range answer {
+		var rr D.RR
+		if addr.Is4() {
+			rr = &D.A{
+				Hdr: D.RR_Header{
+					Name:     msg.Question[0].Name,
+					Rrtype:   D.TypeA,
+					Class:    D.ClassINET,
+					Ttl:      uint32(FakeTTL / time.Second),
+					Rdlength: 4,
+				},
+				A: addr.AsSlice(),
+			}
+		} else if addr.Is6() {
+			rr = &D.AAAA{
+				Hdr: D.RR_Header{
+					Name:     msg.Question[0].Name,
+					Rrtype:   D.TypeAAAA,
+					Class:    D.ClassINET,
+					Ttl:      uint32(FakeTTL / time.Second),
+					Rdlength: 16,
+				},
+				AAAA: addr.AsSlice(),
+			}
+		}
+		resp.Answer = append(resp.Answer, rr)
+	}
+	return &resp
+}
+
+func (d *DNS) getAvailableIP4(domain string) (netip.Addr, bool) {
+	d.domainCache4.Lock()
+	defer d.domainCache4.Unlock()
+	d.domainCache4.UnsafeCheck()
+	addr, ok := d.domainCache4.UnsafeLoad(domain)
+	if ok {
+		d.fakeCache.Store(addr, domain, FakeTTL)
+		d.domainCache4.UnsafeStore(domain, addr, FakeTTL)
+		return addr, true
+	}
+	begin := d.currentIP4
+	for {
+		addr = d.currentIP4.Next()
+		if !fakePrefix4.Contains(addr) {
+			addr = fakePrefix4.Addr().Next().Next()
+		}
+		d.currentIP4 = addr
+		if !d.fakeCache.Contains(addr) {
+			d.fakeCache.Store(addr, domain, FakeTTL)
+			d.domainCache4.UnsafeStore(domain, addr, FakeTTL)
+			return addr, true
+		} else if addr == begin {
+			break
+		}
+	}
+	return addr, false
+}
+
+func (d *DNS) getAvailableIP6(domain string) (netip.Addr, bool) {
+	d.domainCache6.Lock()
+	defer d.domainCache6.Unlock()
+	d.domainCache6.UnsafeCheck()
+	addr, ok := d.domainCache6.UnsafeLoad(domain)
+	if ok {
+		d.fakeCache.Store(addr, domain, FakeTTL)
+		d.domainCache6.UnsafeStore(domain, addr, FakeTTL)
+		return addr, true
+	}
+	begin := d.currentIP6
+	for {
+		addr = d.currentIP6.Next()
+		if !fakePrefix6.Contains(addr) {
+			addr = fakePrefix6.Addr().Next().Next()
+		}
+		d.currentIP6 = addr
+		if !d.fakeCache.Contains(addr) {
+			d.fakeCache.Store(addr, domain, FakeTTL)
+			d.domainCache6.UnsafeStore(domain, addr, FakeTTL)
+			return addr, true
+		} else if addr == begin {
+			break
+		}
+	}
+	return addr, false
+}
+
+func (t *DNS) getServer() M.Socksaddr {
+	if len(t.servers) != 1 {
+		n, err := rand.Int(rand.Reader, big.NewInt(int64(len(t.servers))))
+		if err == nil {
+			return t.servers[n.Uint64()]
+		}
+	}
+	return t.servers[0]
+}
diff --git a/v2raya/service/core/tun/gvisor.go b/v2raya/service/core/tun/gvisor.go
new file mode 100644
index 0000000000..5eb0dd8290
--- /dev/null
+++ b/v2raya/service/core/tun/gvisor.go
@@ -0,0 +1,14 @@
+//go:build !with_gvisor
+
+package tun
+
+import (
+	tun "github.com/sagernet/sing-tun"
+)
+
+type gvisorWaiter struct {
+	stack tun.Stack
+}
+
+func (gc gvisorWaiter) Wait() {
+}
diff --git a/v2raya/service/core/tun/gvisorImpl.go b/v2raya/service/core/tun/gvisorImpl.go
new file mode 100644
index 0000000000..d93795a1d8
--- /dev/null
+++ b/v2raya/service/core/tun/gvisorImpl.go
@@ -0,0 +1,24 @@
+//go:build with_gvisor
+
+package tun
+
+import (
+	"github.com/modern-go/reflect2"
+	"github.com/sagernet/gvisor/pkg/tcpip/stack"
+	tun "github.com/sagernet/sing-tun"
+)
+
+type gvisorWaiter struct {
+	stack tun.Stack
+}
+
+func (gc gvisorWaiter) Wait() {
+	if _, ok := gc.stack.(*tun.GVisor); ok {
+		typ := reflect2.TypeOfPtr(gc.stack).Elem().(*reflect2.UnsafeStructType)
+		if field, ok := typ.FieldByName("stack").(*reflect2.UnsafeStructField); ok {
+			value := field.UnsafeGet(reflect2.PtrOf(gc.stack))
+			stack := *(**stack.Stack)(value)
+			stack.Wait()
+		}
+	}
+}
diff --git a/v2raya/service/core/tun/matcher.go b/v2raya/service/core/tun/matcher.go
new file mode 100644
index 0000000000..42a9b58f72
--- /dev/null
+++ b/v2raya/service/core/tun/matcher.go
@@ -0,0 +1,14 @@
+package tun
+
+import "github.com/v2fly/v2ray-core/v5/common/strmatcher"
+
+type Matcher []strmatcher.Matcher
+
+func (mg Matcher) Match(input string) bool {
+	for _, m := range mg {
+		if m.Match(input) {
+			return true
+		}
+	}
+	return false
+}
diff --git a/v2raya/service/core/tun/singTun.go b/v2raya/service/core/tun/singTun.go
new file mode 100644
index 0000000000..3f6d825d4f
--- /dev/null
+++ b/v2raya/service/core/tun/singTun.go
@@ -0,0 +1,253 @@
+package tun
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"net/netip"
+	"os"
+	"slices"
+	"sync"
+
+	tun "github.com/sagernet/sing-tun"
+	"github.com/sagernet/sing/common/bufio"
+	"github.com/sagernet/sing/common/control"
+	"github.com/sagernet/sing/common/logger"
+	M "github.com/sagernet/sing/common/metadata"
+	N "github.com/sagernet/sing/common/network"
+	"github.com/sagernet/sing/protocol/socks"
+	"github.com/v2fly/v2ray-core/v5/common/strmatcher"
+	"github.com/v2rayA/v2ray-lib/router/routercommon"
+	"github.com/v2rayA/v2rayA/core/dns"
+	"github.com/v2rayA/v2rayA/core/v2ray/asset"
+	"google.golang.org/protobuf/proto"
+)
+
+const (
+	dnsAddr = "172.19.0.2"
+)
+
+var (
+	prefix4 = netip.MustParsePrefix("172.19.0.1/30")
+	prefix6 = netip.MustParsePrefix("fdfe:dcba:9876::1/126")
+
+	defaultLogger = logger.NOP()
+
+	continueHandler = errors.New("continue handler")
+)
+
+type singTun struct {
+	mu        sync.Mutex
+	dialer    N.Dialer
+	forward   N.Dialer
+	cancel    context.CancelFunc
+	closer    io.Closer
+	waiter    *gvisorWaiter
+	dns       *DNS
+	backupDNS map[string][]string
+	whitelist []netip.Addr
+}
+
+func NewSingTun() Tun {
+	dialer := N.SystemDialer
+	client := socks.NewClient(dialer, M.ParseSocksaddrHostPort("127.0.0.1", 52345), socks.Version5, "", "")
+	return &singTun{
+		dialer:  dialer,
+		forward: client,
+		dns:     NewDNS(dialer, client, M.ParseSocksaddrHostPort(dnsAddr, 53)),
+	}
+}
+
+func (t *singTun) Start(stack Stack) error {
+	var failedCloser Closer
+	defer func() {
+		failedCloser.Close()
+	}()
+
+	t.Close()
+	networkUpdateMonitor, err := tun.NewNetworkUpdateMonitor(defaultLogger)
+	if err != nil {
+		return err
+	}
+	failedCloser = append(failedCloser, networkUpdateMonitor)
+	interfaceMonitor, err := tun.NewDefaultInterfaceMonitor(networkUpdateMonitor, defaultLogger, tun.DefaultInterfaceMonitorOptions{})
+	if err != nil {
+		return err
+	}
+	failedCloser = append(failedCloser, interfaceMonitor)
+	tunOptions := tun.Options{
+		Name:         tun.CalculateInterfaceName(""),
+		MTU:          9000,
+		Inet4Address: []netip.Prefix{prefix4},
+		// Inet6Address:     []netip.Prefix{prefix6},
+		AutoRoute:        true,
+		StrictRoute:      false,
+		InterfaceMonitor: interfaceMonitor,
+		TableIndex:       2022,
+	}
+	tunInterface, err := tun.New(tunOptions)
+	if err != nil {
+		return err
+	}
+	failedCloser = append(failedCloser, tunInterface)
+	ctx, cancel := context.WithCancel(context.Background())
+	tunStack, err := tun.NewStack(string(stack), tun.StackOptions{
+		Context:                ctx,
+		Tun:                    tunInterface,
+		MTU:                    tunOptions.MTU,
+		Name:                   tunOptions.Name,
+		Inet4Address:           tunOptions.Inet4Address,
+		Inet6Address:           tunOptions.Inet6Address,
+		EndpointIndependentNat: false,
+		UDPTimeout:             30,
+		Handler:                t,
+		Logger:                 defaultLogger,
+		InterfaceFinder:        control.DefaultInterfaceFinder(),
+	})
+	if err != nil {
+		cancel()
+		return err
+	}
+	failedCloser = append(failedCloser, tunStack)
+	err = tunStack.Start()
+	if err != nil {
+		cancel()
+		return err
+	}
+	t.cancel = cancel
+	t.closer = failedCloser
+	failedCloser = nil
+	t.waiter = &gvisorWaiter{tunStack}
+	t.dns.whitelist, _ = GetWhitelistCN()
+	servers := dns.GetSystemDNS()
+	t.dns.servers = make([]M.Socksaddr, len(servers))
+	for i, addr := range servers {
+		t.dns.servers[i] = M.SocksaddrFromNetIP(addr)
+	}
+	backupDNS := make(map[string][]string)
+	interfaces, _ := dns.GetValidNetworkInterfaces()
+	for _, ifi := range interfaces {
+		backupDNS[ifi], _ = dns.ReplaceDNSServer(ifi, dnsAddr)
+	}
+	t.backupDNS = backupDNS
+	t.whitelist = nil
+	return nil
+}
+
+func (t *singTun) Close() error {
+	t.mu.Lock()
+	if t.cancel != nil {
+		for ifi, server := range t.backupDNS {
+			dns.SetDNSServer(ifi, server...)
+		}
+		t.backupDNS = nil
+		t.cancel()
+		t.closer.Close()
+		t.cancel = nil
+		t.closer = nil
+		if t.waiter != nil {
+			t.waiter.Wait()
+			t.waiter = nil
+		}
+	}
+	t.mu.Unlock()
+	return nil
+}
+
+func (t *singTun) AddDomainWhitelist(domain string) {
+	t.dns.whitelist = append(t.dns.whitelist, strmatcher.FullMatcher(domain))
+}
+
+func (t *singTun) AddIPWhitelist(addr netip.Addr) {
+	t.whitelist = append(t.whitelist, addr)
+}
+
+func (t *singTun) NewConnection(ctx context.Context, conn net.Conn, metadata M.Metadata) error {
+	err := t.dns.NewConnection(ctx, conn, metadata)
+	if err == continueHandler {
+		var dialer N.Dialer
+		if slices.Contains(t.whitelist, metadata.Destination.Addr) {
+			dialer = t.dialer
+		} else {
+			dialer = t.forward
+		}
+		if domain, ok := t.dns.fakeCache.Load(metadata.Destination.Addr); ok {
+			metadata.Destination.Addr = netip.Addr{}
+			metadata.Destination.Fqdn = domain
+		}
+		serverConn, err := dialer.DialContext(ctx, N.NetworkTCP, metadata.Destination)
+		if err != nil {
+			conn.Close()
+			return err
+		}
+		return bufio.CopyConn(ctx, conn, serverConn)
+	}
+	return err
+}
+
+func (t *singTun) NewPacketConnection(ctx context.Context, conn N.PacketConn, metadata M.Metadata) error {
+	err := t.dns.NewPacketConnection(ctx, conn, metadata)
+	if err == continueHandler {
+		var dialer N.Dialer
+		if slices.Contains(t.whitelist, metadata.Destination.Addr) {
+			dialer = t.dialer
+		} else {
+			dialer = t.forward
+		}
+		if domain, ok := t.dns.fakeCache.Load(metadata.Destination.Addr); ok {
+			metadata.Destination.Addr = netip.Addr{}
+			metadata.Destination.Fqdn = domain
+		}
+		serverConn, err := dialer.ListenPacket(ctx, metadata.Destination)
+		if err != nil {
+			conn.Close()
+			return err
+		}
+		return bufio.CopyPacketConn(ctx, conn, bufio.NewPacketConn(serverConn))
+	}
+	return err
+}
+
+func (t *singTun) NewError(ctx context.Context, err error) {
+}
+
+func GetWhitelistCN() (Matcher, error) {
+	datpath, err := asset.GetV2rayLocationAsset("geosite.dat")
+	if err != nil {
+		return nil, err
+	}
+	b, err := os.ReadFile(datpath)
+	if err != nil {
+		return nil, fmt.Errorf("GetWhitelistCn: %w", err)
+	}
+	var siteList routercommon.GeoSiteList
+	err = proto.Unmarshal(b, &siteList)
+	if err != nil {
+		return nil, fmt.Errorf("GetWhitelistCn: %w", err)
+	}
+	var matcher Matcher
+	for _, e := range siteList.Entry {
+		if e.CountryCode == "CN" {
+			for _, dm := range e.Domain {
+				switch dm.Type {
+				case routercommon.Domain_Plain:
+					matcher = append(matcher, strmatcher.SubstrMatcher(dm.Value))
+				case routercommon.Domain_Regex:
+					r, err := strmatcher.Regex.New(dm.Value)
+					if err != nil {
+						continue
+					}
+					matcher = append(matcher, r)
+				case routercommon.Domain_RootDomain:
+					matcher = append(matcher, strmatcher.DomainMatcher(dm.Value))
+				case routercommon.Domain_Full:
+					matcher = append(matcher, strmatcher.FullMatcher(dm.Value))
+				}
+			}
+			break
+		}
+	}
+	return matcher, nil
+}
diff --git a/v2raya/service/core/tun/tun.go b/v2raya/service/core/tun/tun.go
new file mode 100644
index 0000000000..723c2bff5c
--- /dev/null
+++ b/v2raya/service/core/tun/tun.go
@@ -0,0 +1,19 @@
+package tun
+
+import "net/netip"
+
+type Stack string
+
+const (
+	StackGvisor = Stack("gvisor")
+	StackSystem = Stack("system")
+)
+
+type Tun interface {
+	Start(stack Stack) error
+	Close() error
+	AddDomainWhitelist(domain string)
+	AddIPWhitelist(addr netip.Addr)
+}
+
+var Default = NewSingTun()
diff --git a/v2raya/service/core/v2ray/transparent.go b/v2raya/service/core/v2ray/transparent.go
index 9c44c34701..c72c93487b 100644
--- a/v2raya/service/core/v2ray/transparent.go
+++ b/v2raya/service/core/v2ray/transparent.go
@@ -2,12 +2,14 @@ package v2ray
 
 import (
 	"fmt"
+	"net/netip"
 	"strings"
 	"time"
 
 	"github.com/v2rayA/v2rayA/conf"
 	"github.com/v2rayA/v2rayA/core/iptables"
 	"github.com/v2rayA/v2rayA/core/specialMode"
+	"github.com/v2rayA/v2rayA/core/tun"
 	"github.com/v2rayA/v2rayA/db/configure"
 	"github.com/v2rayA/v2rayA/pkg/util/log"
 )
@@ -19,6 +21,7 @@ func deleteTransparentProxyRules() {
 		iptables.Tproxy.GetCleanCommands().Run(false)
 		iptables.Redirect.GetCleanCommands().Run(false)
 		iptables.DropSpoofing.GetCleanCommands().Run(false)
+		tun.Default.Close()
 	}
 	iptables.SystemProxy.GetCleanCommands().Run(false)
 	time.Sleep(30 * time.Millisecond)
@@ -52,6 +55,20 @@ func writeTransparentProxyRules() (err error) {
 			return fmt.Errorf("not support \"redirect\" mode of transparent proxy: %w", err)
 		}
 		iptables.SetWatcher(iptables.Redirect)
+	case configure.TransparentGvisorTun, configure.TransparentSystemTun:
+		mode, _, _ := strings.Cut(string(setting.TransparentType), "_")
+		if err = tun.Default.Start(tun.Stack(mode)); err != nil {
+			return fmt.Errorf("not support \"%s tun\" mode of transparent proxy: %w", mode, err)
+		}
+		_, serverInfos, _ := getConnectedServerObjs()
+		for _, info := range serverInfos {
+			host := info.Info.GetHostname()
+			if addr, err := netip.ParseAddr(host); err == nil {
+				tun.Default.AddIPWhitelist(addr)
+			} else {
+				tun.Default.AddDomainWhitelist(host)
+			}
+		}
 	case configure.TransparentSystemProxy:
 		if err = iptables.SystemProxy.GetSetupCommands().Run(true); err != nil {
 			return fmt.Errorf("not support \"system proxy\" mode of transparent proxy: %w", err)
diff --git a/v2raya/service/core/v2ray/v2rayTmpl.go b/v2raya/service/core/v2ray/v2rayTmpl.go
index a5356463b4..924b8e287e 100644
--- a/v2raya/service/core/v2ray/v2rayTmpl.go
+++ b/v2raya/service/core/v2ray/v2rayTmpl.go
@@ -992,6 +992,32 @@ func (t *Template) appendDNSOutbound() {
 	})
 }
 
+func (t *Template) setSendThrough() {
+	ip, err := GetLanIP4()
+	if err != nil {
+		return
+	}
+	sendThrough := ip.String()
+	for i := 0; i < len(t.Outbounds); i++ {
+		t.Outbounds[i].SendThrough = sendThrough
+	}
+}
+
+func GetLanIP4() (net.IP, error) {
+	addresses, err := net.InterfaceAddrs()
+	if err != nil {
+		return nil, err
+	}
+	for _, addr := range addresses {
+		if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+			if ipnet.IP.To4() != nil {
+				return ipnet.IP, nil
+			}
+		}
+	}
+	return net.IPv4zero, errors.New("lan not found")
+}
+
 func GenerateIdFromAccounts() (id string, err error) {
 	accounts, err := configure.GetAccounts()
 	if err != nil {
@@ -1046,6 +1072,16 @@ func (t *Template) setInbound() error {
 		switch t.Setting.TransparentType {
 		case configure.TransparentTproxy, configure.TransparentRedirect:
 			t.AppendDokodemoTProxy(string(t.Setting.TransparentType), 52345, "transparent")
+		case configure.TransparentGvisorTun, configure.TransparentSystemTun:
+			t.Inbounds = append(t.Inbounds, coreObj.Inbound{
+				Port:     52345,
+				Protocol: "socks",
+				Listen:   "127.0.0.1",
+				Settings: &coreObj.InboundSettings{
+					UDP: true,
+				},
+				Tag: "transparent",
+			})
 		case configure.TransparentSystemProxy:
 			t.Inbounds = append(t.Inbounds, coreObj.Inbound{
 				Port:     52345,
@@ -1604,6 +1640,9 @@ func NewTemplate(serverInfos []serverInfo, setting *configure.Setting) (t *Templ
 	//set inbound listening address and routing
 	t.setDualStack()
 
+	//set outbound sendThrough address
+	t.setSendThrough()
+
 	//check if there are any duplicated tags
 	if err = t.checkDuplicatedTags(); err != nil {
 		return nil, err
diff --git a/v2raya/service/db/configure/const.go b/v2raya/service/db/configure/const.go
index 04af478b13..d6719c293b 100644
--- a/v2raya/service/db/configure/const.go
+++ b/v2raya/service/db/configure/const.go
@@ -22,8 +22,10 @@ const (
 	TransparentGfwlist    = TransparentMode("gfwlist")
 	TransparentFollowRule = TransparentMode("pac")
 
-	TransparentTproxy   = TransparentType("tproxy")
-	TransparentRedirect = TransparentType("redirect")
+	TransparentTproxy      = TransparentType("tproxy")
+	TransparentRedirect    = TransparentType("redirect")
+	TransparentGvisorTun   = TransparentType("gvisor_tun")
+	TransparentSystemTun   = TransparentType("system_tun")
 	TransparentSystemProxy = TransparentType("system_proxy")
 
 	Default = DefaultYesNo("default")
@@ -80,4 +82,4 @@ domain(geosite:geolocation-!cn, geosite:google)->proxy
 domain(geosite:cn)->direct
 ip(geoip:hk,geoip:mo)->proxy
 ip(geoip:private, geoip:cn)->direct`
-)
\ No newline at end of file
+)
diff --git a/v2raya/service/go.mod b/v2raya/service/go.mod
index 4ce48c1927..301608b5de 100644
--- a/v2raya/service/go.mod
+++ b/v2raya/service/go.mod
@@ -19,9 +19,12 @@ require (
 	github.com/gorilla/websocket v1.5.0
 	github.com/json-iterator/go v1.1.12
 	github.com/matoous/go-nanoid v1.5.0
+	github.com/miekg/dns v1.1.57
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	github.com/muhammadmuzzammil1998/jsonc v0.0.0-20201229145248-615b0916ca38
 	github.com/pkg/errors v0.9.1
+	github.com/sagernet/sing v0.2.17
+	github.com/sagernet/sing-tun v0.1.20
 	github.com/shadowsocks/go-shadowsocks2 v0.1.5
 	github.com/shirou/gopsutil/v3 v3.21.11
 	github.com/stevenroose/gonfig v0.1.5
@@ -34,10 +37,11 @@ require (
 	github.com/v2rayA/v2ray-lib v0.0.0-20230812093950-85439332d5ce
 	github.com/v2rayA/v2rayA-lib4 v0.0.0-20230812094818-595f87cb2a49
 	github.com/vearutop/statigz v1.1.7
+	golang.org/x/net v0.18.0
+	golang.org/x/sys v0.14.0
 	go.etcd.io/bbolt v1.3.8
-	golang.org/x/net v0.17.0
-	golang.org/x/sys v0.13.0
 	google.golang.org/grpc v1.57.1
+	google.golang.org/protobuf v1.31.0
 )
 
 require (
@@ -48,9 +52,10 @@ require (
 	github.com/dgryski/go-rc2 v0.0.0-20150621095337-8a9021637152 // indirect
 	github.com/djherbis/times v1.5.0 // indirect
 	github.com/eknkc/basex v1.0.1 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.1 // indirect
@@ -58,6 +63,7 @@ require (
 	github.com/gocarina/gocsv v0.0.0-20210408192840-02d7211d929d // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang/mock v1.6.0 // indirect
+	github.com/google/btree v1.1.2 // indirect
 	github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
@@ -75,22 +81,27 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/quic-go/qtls-go1-20 v0.3.3 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
+	github.com/sagernet/go-tun2socks v1.16.12-0.20220818015926-16cb67876a61 // indirect
+	github.com/sagernet/gvisor v0.0.0-20230930141345-5fef6f2e17ab // indirect
+	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
+	github.com/scjalliance/comshim v0.0.0-20230315213746-5e51f40bd3b9 // indirect
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	gitlab.com/yawning/chacha20.git v0.0.0-20230427033715-7877545b1b37 // indirect
 	go4.org/netipx v0.0.0-20230728184502-ec4c8b891b28 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
 	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
 	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/tools v0.11.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.13.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/v2raya/service/go.sum b/v2raya/service/go.sum
index ffdca8a510..ca6d2e1398 100644
--- a/v2raya/service/go.sum
+++ b/v2raya/service/go.sum
@@ -48,6 +48,8 @@ github.com/ebfe/rc2 v0.0.0-20131011165748-24b9757f5521 h1:fBHFH+Y/GPGFGo7LIrErQc
 github.com/ebfe/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:ucvhdsUCE3TH0LoLRb6ShHiJl8e39dGlx6A4g/ujlow=
 github.com/eknkc/basex v1.0.1 h1:TcyAkqh4oJXgV3WYyL4KEfCMk9W8oJCpmx1bo+jVgKY=
 github.com/eknkc/basex v1.0.1/go.mod h1:k/F/exNEHFdbs3ZHuasoP2E7zeWwZblG84Y7Z59vQRo=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
@@ -67,6 +69,8 @@ github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
+github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
@@ -90,6 +94,8 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
+github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
@@ -131,6 +137,8 @@ github.com/matoous/go-nanoid v1.5.0/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6U
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=
+github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -188,6 +196,18 @@ github.com/refraction-networking/utls v1.4.3 h1:BdWS3BSzCwWCFfMIXP3mjLAyQkdmog7d
 github.com/refraction-networking/utls v1.4.3/go.mod h1:4u9V/awOSBrRw6+federGmVJQfPtemEqLBXkML1b0bo=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
+github.com/sagernet/go-tun2socks v1.16.12-0.20220818015926-16cb67876a61 h1:5+m7c6AkmAylhauulqN/c5dnh8/KssrE9c93TQrXldA=
+github.com/sagernet/go-tun2socks v1.16.12-0.20220818015926-16cb67876a61/go.mod h1:QUQ4RRHD6hGGHdFMEtR8T2P6GS6R3D/CXKdaYHKKXms=
+github.com/sagernet/gvisor v0.0.0-20230930141345-5fef6f2e17ab h1:u+xQoi/Yc6bNUvTfrDD6HhGRybn2lzrhf5vmS+wb4Ho=
+github.com/sagernet/gvisor v0.0.0-20230930141345-5fef6f2e17ab/go.mod h1:3akUhSHSVtLuJaYcW5JPepUraBOW06Ibz2HKwaK5rOk=
+github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
+github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/sing v0.2.17 h1:vMPKb3MV0Aa5ws4dCJkRI8XEjrsUcDn810czd0FwmzI=
+github.com/sagernet/sing v0.2.17/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
+github.com/sagernet/sing-tun v0.1.20 h1:vYWo/w6fkKc8I1WP/IB8eBWZVsGIC6eoEoNR6XqEDlY=
+github.com/sagernet/sing-tun v0.1.20/go.mod h1:6kkPL/u9tWcLFfu55VbwMDnO++17cUihSmImkZjdZro=
+github.com/scjalliance/comshim v0.0.0-20230315213746-5e51f40bd3b9 h1:rc/CcqLH3lh8n+csdOuDfP+NuykE0U6AeYSJJHKDgSg=
+github.com/scjalliance/comshim v0.0.0-20230315213746-5e51f40bd3b9/go.mod h1:a/83NAfUXvEuLpmxDssAXxgUgrEy12MId3Wd7OTs76s=
 github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4 h1:zOjq+1/uLzn/Xo40stbvjIY/yehG0+mfmlsiEmc0xmQ=
 github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4/go.mod h1:aI+8yClBW+1uovkHw6HM01YXnYB8vohtB9C83wzx34E=
 github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U=
@@ -252,6 +272,8 @@ github.com/v2rayA/v2rayA-lib4 v0.0.0-20230812094818-595f87cb2a49 h1:FE97Oau4RRlI
 github.com/v2rayA/v2rayA-lib4 v0.0.0-20230812094818-595f87cb2a49/go.mod h1:2wAXycxxYZlhRY6ql+8SlvdxsG3XRV9ik22Aj/0HkQE=
 github.com/vearutop/statigz v1.1.7 h1:/36vj7srdvhJUwV2tR4rXWhNyO7O6hRyNtpPWnH5fN0=
 github.com/vearutop/statigz v1.1.7/go.mod h1:Shq1bNLzz9IRa6KykXy/1ubPrHehv0oP27cKyiHuj4o=
+github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
+github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/xiaokangwang/VLite v0.0.0-20220418190619-cff95160a432 h1:I/ATawgO2RerCq9ACwL0wBB8xNXZdE3J+93MCEHReRs=
 github.com/xiaokangwang/VLite v0.0.0-20220418190619-cff95160a432/go.mod h1:QN7Go2ftTVfx0aCTh9RXHV8pkpi0FtmbwQw40dy61wQ=
 github.com/xtaci/smux v1.5.24 h1:77emW9dtnOxxOQ5ltR+8BbsX1kzcOxQ5gB+aaV9hXOY=
@@ -278,6 +300,8 @@ golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME=
 golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
@@ -291,6 +315,8 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
@@ -315,18 +341,26 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
 golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/xray-core/infra/conf/transport_internet.go b/xray-core/infra/conf/transport_internet.go
index 805a674ec2..908a95d3ef 100644
--- a/xray-core/infra/conf/transport_internet.go
+++ b/xray-core/infra/conf/transport_internet.go
@@ -392,7 +392,6 @@ type TLSConfig struct {
 	MinVersion                           string           `json:"minVersion"`
 	MaxVersion                           string           `json:"maxVersion"`
 	CipherSuites                         string           `json:"cipherSuites"`
-	PreferServerCipherSuites             bool             `json:"preferServerCipherSuites"`
 	Fingerprint                          string           `json:"fingerprint"`
 	RejectUnknownSNI                     bool             `json:"rejectUnknownSni"`
 	PinnedPeerCertificateChainSha256     *[]string        `json:"pinnedPeerCertificateChainSha256"`
@@ -424,7 +423,6 @@ func (c *TLSConfig) Build() (proto.Message, error) {
 	config.MinVersion = c.MinVersion
 	config.MaxVersion = c.MaxVersion
 	config.CipherSuites = c.CipherSuites
-	config.PreferServerCipherSuites = c.PreferServerCipherSuites
 	config.Fingerprint = strings.ToLower(c.Fingerprint)
 	if config.Fingerprint != "" && tls.GetFingerprint(config.Fingerprint) == nil {
 		return nil, newError(`unknown fingerprint: `, config.Fingerprint)
diff --git a/xray-core/transport/internet/http/dialer.go b/xray-core/transport/internet/http/dialer.go
index 513962d3f3..acccd0b72a 100644
--- a/xray-core/transport/internet/http/dialer.go
+++ b/xray-core/transport/internet/http/dialer.go
@@ -97,13 +97,10 @@ func getHTTPClient(ctx context.Context, dest net.Destination, streamSettings *in
 					return nil, err
 				}
 			}
-			negotiatedProtocol, negotiatedProtocolIsMutual := cn.NegotiatedProtocol()
+			negotiatedProtocol := cn.NegotiatedProtocol()
 			if negotiatedProtocol != http2.NextProtoTLS {
 				return nil, newError("http2: unexpected ALPN protocol " + negotiatedProtocol + "; want q" + http2.NextProtoTLS).AtError()
 			}
-			if !negotiatedProtocolIsMutual {
-				return nil, newError("http2: could not negotiate protocol mutually").AtError()
-			}
 			return cn, nil
 		},
 	}
diff --git a/xray-core/transport/internet/tls/config.go b/xray-core/transport/internet/tls/config.go
index 03c43a9e08..36aca80335 100644
--- a/xray-core/transport/internet/tls/config.go
+++ b/xray-core/transport/internet/tls/config.go
@@ -368,8 +368,6 @@ func (c *Config) GetTLSConfig(opts ...Option) *tls.Config {
 		}
 	}
 
-	config.PreferServerCipherSuites = c.PreferServerCipherSuites
-
 	if len(c.MasterKeyLog) > 0 && c.MasterKeyLog != "none" {
 		writer, err := os.OpenFile(c.MasterKeyLog, os.O_CREATE|os.O_RDWR|os.O_APPEND, 0644)
 		if err != nil {
diff --git a/xray-core/transport/internet/tls/config.pb.go b/xray-core/transport/internet/tls/config.pb.go
index 0e616ae8fa..d8c9a423a1 100644
--- a/xray-core/transport/internet/tls/config.pb.go
+++ b/xray-core/transport/internet/tls/config.pb.go
@@ -194,6 +194,9 @@ type Config struct {
 	// Specify cipher suites, except for TLS 1.3.
 	CipherSuites string `protobuf:"bytes,9,opt,name=cipher_suites,json=cipherSuites,proto3" json:"cipher_suites,omitempty"`
 	// Whether the server selects its most preferred ciphersuite.
+	// Deprecated: crypto/tls has ignored this field.
+	//
+	// Deprecated: Marked as deprecated in transport/internet/tls/config.proto.
 	PreferServerCipherSuites bool `protobuf:"varint,10,opt,name=prefer_server_cipher_suites,json=preferServerCipherSuites,proto3" json:"prefer_server_cipher_suites,omitempty"`
 	// TLS Client Hello fingerprint (uTLS).
 	Fingerprint      string `protobuf:"bytes,11,opt,name=fingerprint,proto3" json:"fingerprint,omitempty"`
@@ -306,6 +309,7 @@ func (x *Config) GetCipherSuites() string {
 	return ""
 }
 
+// Deprecated: Marked as deprecated in transport/internet/tls/config.proto.
 func (x *Config) GetPreferServerCipherSuites() bool {
 	if x != nil {
 		return x.PreferServerCipherSuites
@@ -377,7 +381,7 @@ var file_transport_internet_tls_config_proto_rawDesc = []byte{
 	0x43, 0x49, 0x50, 0x48, 0x45, 0x52, 0x4d, 0x45, 0x4e, 0x54, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
 	0x41, 0x55, 0x54, 0x48, 0x4f, 0x52, 0x49, 0x54, 0x59, 0x5f, 0x56, 0x45, 0x52, 0x49, 0x46, 0x59,
 	0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x41, 0x55, 0x54, 0x48, 0x4f, 0x52, 0x49, 0x54, 0x59, 0x5f,
-	0x49, 0x53, 0x53, 0x55, 0x45, 0x10, 0x02, 0x22, 0xf2, 0x05, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66,
+	0x49, 0x53, 0x53, 0x55, 0x45, 0x10, 0x02, 0x22, 0xf6, 0x05, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66,
 	0x69, 0x67, 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x69, 0x6e, 0x73, 0x65,
 	0x63, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x61, 0x6c, 0x6c, 0x6f,
 	0x77, 0x49, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x12, 0x4a, 0x0a, 0x0b, 0x63, 0x65, 0x72,
@@ -402,37 +406,37 @@ var file_transport_internet_tls_config_proto_rawDesc = []byte{
 	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d,
 	0x61, 0x78, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x69, 0x70,
 	0x68, 0x65, 0x72, 0x5f, 0x73, 0x75, 0x69, 0x74, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x12, 0x3d,
+	0x52, 0x0c, 0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x12, 0x41,
 	0x0a, 0x1b, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f,
 	0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x5f, 0x73, 0x75, 0x69, 0x74, 0x65, 0x73, 0x18, 0x0a, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x18, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x12, 0x20, 0x0a,
-	0x0b, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x12,
-	0x2c, 0x0a, 0x12, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77,
-	0x6e, 0x5f, 0x73, 0x6e, 0x69, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x72, 0x65, 0x6a,
-	0x65, 0x63, 0x74, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x53, 0x6e, 0x69, 0x12, 0x4e, 0x0a,
-	0x24, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x63, 0x65, 0x72,
-	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x73,
-	0x68, 0x61, 0x32, 0x35, 0x36, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x20, 0x70, 0x69, 0x6e,
-	0x6e, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x53, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, 0x57, 0x0a,
-	0x29, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x63, 0x65, 0x72,
-	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f,
-	0x6b, 0x65, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x32, 0x35, 0x36, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0c,
-	0x52, 0x24, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x43, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79,
-	0x53, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, 0x24, 0x0a, 0x0e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72,
-	0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x6c, 0x6f, 0x67, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
-	0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x4c, 0x6f, 0x67, 0x42, 0x73, 0x0a, 0x1f,
-	0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
-	0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x74, 0x6c, 0x73, 0x50,
-	0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74,
-	0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x74, 0x72, 0x61,
-	0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f,
-	0x74, 0x6c, 0x73, 0xaa, 0x02, 0x1b, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73,
-	0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x54, 0x6c,
-	0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x28, 0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x18, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x53,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65,
+	0x73, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74,
+	0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72,
+	0x69, 0x6e, 0x74, 0x12, 0x2c, 0x0a, 0x12, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x6e,
+	0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x73, 0x6e, 0x69, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x10, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x53, 0x6e,
+	0x69, 0x12, 0x4e, 0x0a, 0x24, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x70, 0x65, 0x65, 0x72,
+	0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68, 0x61,
+	0x69, 0x6e, 0x5f, 0x73, 0x68, 0x61, 0x32, 0x35, 0x36, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0c, 0x52,
+	0x20, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x43, 0x65, 0x72, 0x74, 0x69,
+	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x53, 0x68, 0x61, 0x32, 0x35,
+	0x36, 0x12, 0x57, 0x0a, 0x29, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x70, 0x65, 0x65, 0x72,
+	0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x75, 0x62,
+	0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x68, 0x61, 0x32, 0x35, 0x36, 0x18, 0x0e,
+	0x20, 0x03, 0x28, 0x0c, 0x52, 0x24, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72,
+	0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69,
+	0x63, 0x4b, 0x65, 0x79, 0x53, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, 0x24, 0x0a, 0x0e, 0x6d, 0x61,
+	0x73, 0x74, 0x65, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x6c, 0x6f, 0x67, 0x18, 0x0f, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0c, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x4c, 0x6f, 0x67,
+	0x42, 0x73, 0x0a, 0x1f, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x74, 0x72, 0x61,
+	0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e,
+	0x74, 0x6c, 0x73, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x78, 0x74, 0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x65, 0x74, 0x2f, 0x74, 0x6c, 0x73, 0xaa, 0x02, 0x1b, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x54,
+	0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65,
+	0x74, 0x2e, 0x54, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/xray-core/transport/internet/tls/config.proto b/xray-core/transport/internet/tls/config.proto
index b1c26a4cc1..12c7b7cb34 100644
--- a/xray-core/transport/internet/tls/config.proto
+++ b/xray-core/transport/internet/tls/config.proto
@@ -63,7 +63,8 @@ message Config {
   string cipher_suites = 9;
 
   // Whether the server selects its most preferred ciphersuite.
-  bool prefer_server_cipher_suites = 10;
+  // Deprecated: crypto/tls has ignored this field.
+  bool prefer_server_cipher_suites = 10 [deprecated = true];
 
   // TLS Client Hello fingerprint (uTLS).
   string fingerprint = 11;
diff --git a/xray-core/transport/internet/tls/tls.go b/xray-core/transport/internet/tls/tls.go
index 73631ef98a..25889cb12a 100644
--- a/xray-core/transport/internet/tls/tls.go
+++ b/xray-core/transport/internet/tls/tls.go
@@ -18,10 +18,11 @@ type Interface interface {
 	net.Conn
 	HandshakeContext(ctx context.Context) error
 	VerifyHostname(host string) error
-	NegotiatedProtocol() (name string, mutual bool)
+	NegotiatedProtocol() string
 }
 
 var _ buf.Writer = (*Conn)(nil)
+var _ Interface = (*Conn)(nil)
 
 type Conn struct {
 	*tls.Conn
@@ -55,9 +56,9 @@ func (c *Conn) HandshakeAddressContext(ctx context.Context) net.Address {
 	return net.ParseAddress(state.ServerName)
 }
 
-func (c *Conn) NegotiatedProtocol() (name string, mutual bool) {
+func (c *Conn) NegotiatedProtocol() string {
 	state := c.ConnectionState()
-	return state.NegotiatedProtocol, state.NegotiatedProtocolIsMutual
+	return state.NegotiatedProtocol
 }
 
 // Client initiates a TLS client handshake on the given connection.
@@ -76,6 +77,8 @@ type UConn struct {
 	*utls.UConn
 }
 
+var _ Interface = (*UConn)(nil)
+
 func (c *UConn) Close() error {
 	timer := time.AfterFunc(tlsCloseTimeout, func() {
 		c.Conn.NetConn().Close()
@@ -122,9 +125,9 @@ func (c *UConn) WebsocketHandshakeContext(ctx context.Context) error {
 	return c.HandshakeContext(ctx)
 }
 
-func (c *UConn) NegotiatedProtocol() (name string, mutual bool) {
+func (c *UConn) NegotiatedProtocol() string {
 	state := c.ConnectionState()
-	return state.NegotiatedProtocol, state.NegotiatedProtocolIsMutual
+	return state.NegotiatedProtocol
 }
 
 func UClient(c net.Conn, config *tls.Config, fingerprint *utls.ClientHelloID) net.Conn {
diff --git a/yass/CMakeLists.txt b/yass/CMakeLists.txt
index 05d4507a4f..69b5c428dd 100644
--- a/yass/CMakeLists.txt
+++ b/yass/CMakeLists.txt
@@ -441,6 +441,7 @@ option(USE_ICU "Build with icu" OFF)
 option(USE_LEVELDB "Build with leveldb" OFF)
 option(USE_SQLITE "Build with sqlite" OFF)
 option(USE_OLD_SYSTEMD_SERVICE "Install with old systemd service files" OFF)
+option(USE_QUICHE "Build with quiche support" ON)
 
 option(ENABLE_FORTIFY "Enable build with Fortify Source" ON)
 option(ENABLE_LTO "Enable build with LTO" ON)
@@ -3170,24 +3171,30 @@ endif()
 #           QUICHE Library
 # *****************************************************************************************
 
-# include both of googleurl and quiche
-# TODO:Uncomment the below line out
-add_subdirectory(third_party/quiche)
-list(APPEND YASS_APP_FEATURES "quiche")
-set(SUPPORT_DEFINITIONS
-  HAVE_QUICHE
-  ${SUPPORT_DEFINITIONS}
-)
-set(SUPPORT_LIBS url quiche ${SUPPORT_LIBS})
+set(SUPPORT_LIBS url ${SUPPORT_LIBS})
+if (USE_QUICHE)
+  add_subdirectory(third_party/quiche)
+  list(APPEND YASS_APP_FEATURES "quiche")
+  set(SUPPORT_DEFINITIONS
+    HAVE_QUICHE
+    ${SUPPORT_DEFINITIONS}
+  )
+  set(SUPPORT_LIBS quiche ${SUPPORT_LIBS})
+endif()
 
 # *****************************************************************************************
 #           http-parser Library
 # *****************************************************************************************
 
+if (NOT USE_QUICHE AND USE_BALSA_HTTP_PARSER)
+  message(STATUS "Quiche is disabled, using http-parser instead")
+  set(USE_BALSA_HTTP_PARSER FALSE)
+endif()
+
 if (USE_SYSTEM_HTTP_PARSER AND NOT USE_BALSA_HTTP_PARSER)
   check_library_exists(http_parser http_parser_init "" HAVE_HTTP_PARSER_INIT)
   if (NOT HAVE_HTTP_PARSER_INIT)
-    message(STATUS "System http_parser not found, using bundled one")
+    message(STATUS "System http-parser not found, using bundled one")
     set(USE_SYSTEM_HTTP_PARSER FALSE)
   endif()
 endif()
diff --git a/yass/src/android/yass.cpp b/yass/src/android/yass.cpp
index a66bcc362b..ff7c1d1d5a 100644
--- a/yass/src/android/yass.cpp
+++ b/yass/src/android/yass.cpp
@@ -6,7 +6,7 @@
 #include "android/yass.hpp"
 
 #include <jni.h>
-#include <openssl/crypto.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #include "android/jni.hpp"
 #include "android/utils.hpp"
diff --git a/yass/src/cli/cli.cpp b/yass/src/cli/cli.cpp
index 739ff94918..2543305ab4 100644
--- a/yass/src/cli/cli.cpp
+++ b/yass/src/cli/cli.cpp
@@ -10,9 +10,10 @@
 #include <absl/flags/flag.h>
 #include <absl/flags/parse.h>
 #include <absl/strings/str_cat.h>
+#include <absl/strings/str_join.h>
 #include <build/build_config.h>
 #include <locale.h>
-#include <openssl/crypto.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #include "core/logging.hpp"
 #include "crypto/crypter_export.hpp"
diff --git a/yass/src/cli/cli_connection.cpp b/yass/src/cli/cli_connection.cpp
index 2c3d7160a8..3b6163dc3c 100644
--- a/yass/src/cli/cli_connection.cpp
+++ b/yass/src/cli/cli_connection.cpp
@@ -15,10 +15,14 @@
 #include "net/padding.hpp"
 
 #include <build/build_config.h>
+
+#ifdef HAVE_QUICHE
 #include <quiche/spdy/core/hpack/hpack_constants.h>
+#endif
 
 using namespace net;
 
+#ifdef HAVE_QUICHE
 static std::vector<http2::adapter::Header> GenerateHeaders(std::vector<std::pair<std::string, std::string>> headers,
                                                            int status = 0) {
   std::vector<http2::adapter::Header> response_vector;
@@ -73,6 +77,7 @@ static void FillNonindexHeaderValue(uint64_t unique_bits, char* buf, int len) {
     buf[i] = g_nonindex_codes[16];
   }
 }
+#endif
 
 namespace cli {
 
@@ -91,6 +96,7 @@ static bool IsIPv4MappedIPv6(const asio::ip::tcp::endpoint& address) {
 }
 #endif
 
+#ifdef HAVE_QUICHE
 bool DataFrameSource::Send(absl::string_view frame_header, size_t payload_length) {
   std::string concatenated;
   if (payload_length) {
@@ -142,6 +148,7 @@ bool DataFrameSource::Send(absl::string_view frame_header, size_t payload_length
 
   return true;
 }
+#endif
 
 CliConnection::CliConnection(asio::io_context& io_context,
                              const std::string& remote_host_ips,
@@ -190,6 +197,7 @@ void CliConnection::close() {
     VLOG(1) << "close() error: " << ec;
   }
   if (channel_) {
+#ifdef HAVE_QUICHE
     if (adapter_) {
       if (data_frame_) {
         data_frame_->set_last_frame(true);
@@ -203,11 +211,13 @@ void CliConnection::close() {
       SendIfNotProcessing();
       WriteUpstreamInPipe();
     }
+#endif
     channel_->close();
   }
   on_disconnect();
 }
 
+#ifdef HAVE_QUICHE
 void CliConnection::SendIfNotProcessing() {
   if (!processing_responses_) {
     processing_responses_ = true;
@@ -215,6 +225,7 @@ void CliConnection::SendIfNotProcessing() {
     processing_responses_ = false;
   }
 }
+#endif
 
 //
 // cipher_visitor_interface
@@ -229,6 +240,7 @@ void CliConnection::on_protocol_error() {
   disconnected(asio::error::connection_aborted);
 }
 
+#ifdef HAVE_QUICHE
 //
 // http2::adapter::Http2VisitorInterface
 //
@@ -370,6 +382,8 @@ bool CliConnection::OnMetadataEndForStream(StreamId stream_id) {
   return true;
 }
 
+#endif
+
 void CliConnection::ReadMethodSelect() {
   scoped_refptr<CliConnection> self(this);
 
@@ -950,7 +964,9 @@ std::shared_ptr<IOBuf> CliConnection::GetNextDownstreamBuf(asio::error_code& ec,
     return nullptr;
   }
 
+#ifdef HAVE_QUICHE
 try_again:
+#endif
   // RstStream might be sent in ProcessBytes
   if (channel_->eof()) {
     ec = asio::error::eof;
@@ -979,6 +995,7 @@ try_again:
   }
   *bytes_transferred += read;
 
+#ifdef HAVE_QUICHE
   if (adapter_) {
     absl::string_view remaining_buffer(reinterpret_cast<const char*>(buf->data()), buf->length());
     while (!remaining_buffer.empty()) {
@@ -994,7 +1011,9 @@ try_again:
     if (downstream_.byte_length() < H2_STREAM_WINDOW_SIZE) {
       goto try_again;
     }
-  } else if (upstream_https_fallback_) {
+  } else
+#endif
+      if (upstream_https_fallback_) {
     if (upstream_handshake_) {
       upstream_handshake_ = false;
       HttpResponseParser parser;
@@ -1033,11 +1052,13 @@ try_again:
   }
 
 out:
+#ifdef HAVE_QUICHE
   if (adapter_ && adapter_->want_write()) {
     // Send Control Streams
     SendIfNotProcessing();
     WriteUpstreamInPipe();
   }
+#endif
   if (downstream_.empty()) {
     if (!ec) {
       ec = asio::error::try_again;
@@ -1180,6 +1201,7 @@ std::shared_ptr<IOBuf> CliConnection::GetNextUpstreamBuf(asio::error_code& ec, s
     return nullptr;
   }
 
+#ifdef HAVE_QUICHE
   if (adapter_) {
     if (!data_frame_) {
       ec = asio::error::eof;
@@ -1190,18 +1212,22 @@ std::shared_ptr<IOBuf> CliConnection::GetNextUpstreamBuf(asio::error_code& ec, s
       AddPadding(buf);
     }
     data_frame_->AddChunk(buf);
-  } else if (upstream_https_fallback_) {
+  } else
+#endif
+      if (upstream_https_fallback_) {
     upstream_.push_back(buf);
   } else {
     EncryptData(&upstream_, buf);
   }
 
 out:
+#ifdef HAVE_QUICHE
   if (data_frame_ && *bytes_transferred) {
     data_frame_->SetSendCompletionCallback(std::function<void()>());
     adapter_->ResumeStream(stream_id_);
     SendIfNotProcessing();
   }
+#endif
   if (upstream_.empty()) {
     if (!ec) {
       ec = asio::error::try_again;
@@ -1427,6 +1453,7 @@ void CliConnection::OnStreamRead(std::shared_ptr<IOBuf> buf) {
     return;
   }
 
+#ifdef HAVE_QUICHE
   // SendContents
   if (adapter_) {
     if (!data_frame_) {
@@ -1440,7 +1467,9 @@ void CliConnection::OnStreamRead(std::shared_ptr<IOBuf> buf) {
     data_frame_->SetSendCompletionCallback(std::function<void()>());
     adapter()->ResumeStream(stream_id_);
     SendIfNotProcessing();
-  } else if (upstream_https_fallback_) {
+  } else
+#endif
+      if (upstream_https_fallback_) {
     upstream_.push_back(buf);
   } else {
     EncryptData(&upstream_, buf);
@@ -1527,14 +1556,15 @@ void CliConnection::connected() {
   VLOG(2) << "Connection (client) " << connection_id()
           << " remote: established upstream connection with: " << remote_domain();
 
-  bool http2 = absl::GetFlag(FLAGS_method).method == CRYPTO_HTTP2_PLAINTEXT;
-  http2 |= (absl::GetFlag(FLAGS_method).method == CRYPTO_HTTP2);
+  const auto method = absl::GetFlag(FLAGS_method).method;
+  bool http2 = CIPHER_METHOD_IS_HTTP2(method);
   if (http2 && channel_->https_fallback()) {
     http2 = false;
     upstream_https_fallback_ = true;
   }
 
   // Create adapters
+#ifdef HAVE_QUICHE
   if (http2) {
 #ifdef HAVE_NGHTTP2
     adapter_ = http2::adapter::NgHttp2Adapter::CreateClientAdapter(*this);
@@ -1544,16 +1574,20 @@ void CliConnection::connected() {
     adapter_ = http2::adapter::OgHttp2Adapter::Create(*this, options);
 #endif
     padding_support_ = absl::GetFlag(FLAGS_padding_support);
-  } else if (upstream_https_fallback_) {
+  } else
+#endif
+      if (upstream_https_fallback_) {
     // nothing to create
     // TODO should we support it?
     // padding_support_ = absl::GetFlag(FLAGS_padding_support);
   } else {
+    DCHECK(!http2);
     encoder_ =
         std::make_unique<cipher>("", absl::GetFlag(FLAGS_password), absl::GetFlag(FLAGS_method).method, this, true);
     decoder_ = std::make_unique<cipher>("", absl::GetFlag(FLAGS_password), absl::GetFlag(FLAGS_method).method, this);
   }
 
+#ifdef HAVE_QUICHE
   // Send Upstream Settings (HTTP2 Only)
   if (adapter_) {
     std::vector<http2::adapter::Http2Setting> settings{
@@ -1609,7 +1643,9 @@ void CliConnection::connected() {
     stream_id_ = adapter_->SubmitRequest(GenerateHeaders(headers), std::move(data_frame), nullptr);
     data_frame_->set_stream_id(stream_id_);
     SendIfNotProcessing();
-  } else if (upstream_https_fallback_) {
+  } else
+#endif
+      if (upstream_https_fallback_) {
     std::string hostname_and_port;
     std::string host;
     int port;
@@ -1680,17 +1716,20 @@ void CliConnection::sent() {
   WriteUpstreamInPipe();
   OnUpstreamWriteFlush();
 
+#ifdef HAVE_QUICHE
   if (blocked_stream_) {
     adapter_->ResumeStream(blocked_stream_);
     SendIfNotProcessing();
     OnUpstreamWriteFlush();
   }
+#endif
 }
 
 void CliConnection::disconnected(asio::error_code ec) {
   scoped_refptr<CliConnection> self(this);
   VLOG(1) << "Connection (client) " << connection_id() << " upstream: lost connection with: " << remote_domain()
           << " due to " << ec;
+#ifdef HAVE_QUICHE
   if (data_frame_) {
     data_frame_->set_last_frame(true);
     adapter_->ResumeStream(stream_id_);
@@ -1699,6 +1738,7 @@ void CliConnection::disconnected(asio::error_code ec) {
     stream_id_ = 0;
     WriteUpstreamInPipe();
   }
+#endif
   upstream_readable_ = false;
   upstream_writable_ = false;
   channel_->close();
diff --git a/yass/src/cli/cli_connection.hpp b/yass/src/cli/cli_connection.hpp
index a58f4fe577..fe617b9eab 100644
--- a/yass/src/cli/cli_connection.hpp
+++ b/yass/src/cli/cli_connection.hpp
@@ -29,11 +29,13 @@
 #include <absl/strings/string_view.h>
 #include <deque>
 
+#ifdef HAVE_QUICHE
 #ifdef HAVE_NGHTTP2
 #include <quiche/http2/adapter/nghttp2_adapter.h>
 #else
 #include <quiche/http2/adapter/oghttp2_adapter.h>
 #endif
+#endif
 
 namespace cli {
 
@@ -41,10 +43,13 @@ using IOBuf = net::IOBuf;
 using cipher = net::cipher;
 using IoQueue = net::IoQueue;
 
+#ifdef HAVE_QUICHE
 using StreamId = http2::adapter::Http2StreamId;
 template <typename T>
 using StreamMap = absl::flat_hash_map<StreamId, T>;
+#endif  // HAVE_QUICHE
 
+#ifdef HAVE_QUICHE
 class CliConnection;
 class DataFrameSource : public http2::adapter::DataFrameSource {
  public:
@@ -79,14 +84,17 @@ class DataFrameSource : public http2::adapter::DataFrameSource {
   bool last_frame_ = false;
   std::function<void()> send_completion_callback_;
 };
+#endif  // HAVE_QUICHE
 
 /// The ultimate service class to deliever the network traffic to the remote
 /// endpoint
 class CliConnection : public RefCountedThreadSafe<CliConnection>,
+#ifdef HAVE_QUICHE
+                      public http2::adapter::Http2VisitorInterface,
+#endif  // HAVE_QUICHE
                       public net::Channel,
                       public net::Connection,
-                      public net::cipher_visitor_interface,
-                      public http2::adapter::Http2VisitorInterface {
+                      public net::cipher_visitor_interface {
  public:
   /// The state of service
   enum state {
@@ -162,6 +170,7 @@ class CliConnection : public RefCountedThreadSafe<CliConnection>,
   /// flag to mark connection is shut down
   bool shutdown_ = false;
 
+#ifdef HAVE_QUICHE
  private:
   void SendIfNotProcessing();
   bool processing_responses_ = false;
@@ -170,12 +179,14 @@ class CliConnection : public RefCountedThreadSafe<CliConnection>,
 
  public:
   StreamId blocked_stream_ = 0;
+#endif  //  HAVE_QUICHE
 
  public:
   // cipher_visitor_interface
   bool on_received_data(std::shared_ptr<IOBuf> buf) override;
   void on_protocol_error() override;
 
+#ifdef HAVE_QUICHE
  public:
   // http2::adapter::Http2VisitorInterface
   //
@@ -223,6 +234,8 @@ class CliConnection : public RefCountedThreadSafe<CliConnection>,
   http2::adapter::NgHttp2Adapter* adapter() { return adapter_.get(); }
 #else
   http2::adapter::OgHttp2Adapter* adapter() { return adapter_.get(); }
+#endif
+
 #endif
 
  private:
@@ -411,6 +424,7 @@ class CliConnection : public RefCountedThreadSafe<CliConnection>,
   /// the upstream the service bound with
   scoped_refptr<net::stream> channel_;
 
+#ifdef HAVE_QUICHE
   /// the http2 upstream adapter
 #ifdef HAVE_NGHTTP2
   std::unique_ptr<http2::adapter::NgHttp2Adapter> adapter_;
@@ -418,6 +432,7 @@ class CliConnection : public RefCountedThreadSafe<CliConnection>,
   std::unique_ptr<http2::adapter::OgHttp2Adapter> adapter_;
 #endif
   absl::flat_hash_map<std::string, std::string> request_map_;
+#endif
 
   /// the queue to write downstream
   IoQueue downstream_;
diff --git a/yass/src/cli/cli_worker.cpp b/yass/src/cli/cli_worker.cpp
index cd31779a91..ee1d2bfe34 100644
--- a/yass/src/cli/cli_worker.cpp
+++ b/yass/src/cli/cli_worker.cpp
@@ -6,7 +6,7 @@
 #include <absl/flags/flag.h>
 #include <absl/strings/str_cat.h>
 #include <absl/strings/str_join.h>
-#include <openssl/crypto.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #ifdef _WIN32
 #include <ws2tcpip.h>
diff --git a/yass/src/config/config.cpp b/yass/src/config/config.cpp
index 0936b13468..3fadc9c4a1 100644
--- a/yass/src/config/config.cpp
+++ b/yass/src/config/config.cpp
@@ -178,7 +178,7 @@ ABSL_FLAG(std::string, password, "password", "Server password");
 static const std::string kCipherMethodHelpMessage =
     absl::StrCat("Specify encrypt of method to use, one of ",
                  absl::string_view(kCipherMethodsStr, strlen(kCipherMethodsStr) - 2));
-ABSL_FLAG(CipherMethodFlag, method, CipherMethodFlag(CRYPTO_HTTP2), kCipherMethodHelpMessage);
+ABSL_FLAG(CipherMethodFlag, method, CipherMethodFlag(CRYPTO_DEFAULT), kCipherMethodHelpMessage);
 
 ABSL_FLAG(uint32_t, parallel_max, 512, "Maximum concurrency for parallel connections");
 
diff --git a/yass/src/crypto/aead_evp_decrypter.cpp b/yass/src/crypto/aead_evp_decrypter.cpp
index 2cc3978796..4b3094a5ec 100644
--- a/yass/src/crypto/aead_evp_decrypter.cpp
+++ b/yass/src/crypto/aead_evp_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "net/protocol.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/crypto.h>
-#include <openssl/err.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
+#include "third_party/boringssl/src/include/openssl/err.h"
 
 // In debug builds only, log OpenSSL error stack. Then clear OpenSSL error
 // stack.
diff --git a/yass/src/crypto/aead_evp_decrypter.hpp b/yass/src/crypto/aead_evp_decrypter.hpp
index 3e280ff5dd..9434373ca0 100644
--- a/yass/src/crypto/aead_evp_decrypter.hpp
+++ b/yass/src/crypto/aead_evp_decrypter.hpp
@@ -8,7 +8,7 @@
 
 #ifdef HAVE_BORINGSSL
 
-#include <openssl/aead.h>
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 namespace crypto {
 
diff --git a/yass/src/crypto/aead_evp_encrypter.cpp b/yass/src/crypto/aead_evp_encrypter.cpp
index 5816afbe31..ce56ebc2de 100644
--- a/yass/src/crypto/aead_evp_encrypter.cpp
+++ b/yass/src/crypto/aead_evp_encrypter.cpp
@@ -6,8 +6,8 @@
 #include "net/protocol.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/crypto.h>
-#include <openssl/err.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
+#include "third_party/boringssl/src/include/openssl/err.h"
 
 // In debug builds only, log OpenSSL error stack. Then clear OpenSSL error
 // stack.
diff --git a/yass/src/crypto/aead_evp_encrypter.hpp b/yass/src/crypto/aead_evp_encrypter.hpp
index a8d964e461..a82fd2883c 100644
--- a/yass/src/crypto/aead_evp_encrypter.hpp
+++ b/yass/src/crypto/aead_evp_encrypter.hpp
@@ -8,7 +8,7 @@
 
 #ifdef HAVE_BORINGSSL
 
-#include <openssl/aead.h>
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 namespace crypto {
 
diff --git a/yass/src/crypto/aead_sodium_decrypter.cpp b/yass/src/crypto/aead_sodium_decrypter.cpp
index fab3bd3b69..bed0a8b43d 100644
--- a/yass/src/crypto/aead_sodium_decrypter.cpp
+++ b/yass/src/crypto/aead_sodium_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "net/protocol.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/crypto.h>
-#include <openssl/err.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
+#include "third_party/boringssl/src/include/openssl/err.h"
 
 // In debug builds only, log OpenSSL error stack. Then clear OpenSSL error
 // stack.
diff --git a/yass/src/crypto/aead_sodium_decrypter.hpp b/yass/src/crypto/aead_sodium_decrypter.hpp
index d8afcec65a..4c7ce2af3f 100644
--- a/yass/src/crypto/aead_sodium_decrypter.hpp
+++ b/yass/src/crypto/aead_sodium_decrypter.hpp
@@ -8,7 +8,7 @@
 
 #ifdef HAVE_BORINGSSL
 
-#include <openssl/aead.h>
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 namespace crypto {
 
diff --git a/yass/src/crypto/aead_sodium_encrypter.hpp b/yass/src/crypto/aead_sodium_encrypter.hpp
index 90b7079592..f9882f54e4 100644
--- a/yass/src/crypto/aead_sodium_encrypter.hpp
+++ b/yass/src/crypto/aead_sodium_encrypter.hpp
@@ -8,7 +8,7 @@
 
 #ifdef HAVE_BORINGSSL
 
-#include <openssl/aead.h>
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 namespace crypto {
 
diff --git a/yass/src/crypto/aes_128_gcm_12_evp_decrypter.cpp b/yass/src/crypto/aes_128_gcm_12_evp_decrypter.cpp
index c8a4a71911..7245b944a0 100644
--- a/yass/src/crypto/aes_128_gcm_12_evp_decrypter.cpp
+++ b/yass/src/crypto/aes_128_gcm_12_evp_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 16;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/aes_128_gcm_12_evp_encrypter.cpp b/yass/src/crypto/aes_128_gcm_12_evp_encrypter.cpp
index e015f7a0cf..7503b99ea3 100644
--- a/yass/src/crypto/aes_128_gcm_12_evp_encrypter.cpp
+++ b/yass/src/crypto/aes_128_gcm_12_evp_encrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 16;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/aes_128_gcm_evp_decrypter.cpp b/yass/src/crypto/aes_128_gcm_evp_decrypter.cpp
index 5a6031428c..669c3d9fb3 100644
--- a/yass/src/crypto/aes_128_gcm_evp_decrypter.cpp
+++ b/yass/src/crypto/aes_128_gcm_evp_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 16;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/aes_128_gcm_evp_encrypter.cpp b/yass/src/crypto/aes_128_gcm_evp_encrypter.cpp
index db09c9a923..47b4b93b75 100644
--- a/yass/src/crypto/aes_128_gcm_evp_encrypter.cpp
+++ b/yass/src/crypto/aes_128_gcm_evp_encrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 16;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/aes_192_gcm_evp_decrypter.cpp b/yass/src/crypto/aes_192_gcm_evp_decrypter.cpp
index 1da402134f..fd99a60bc0 100644
--- a/yass/src/crypto/aes_192_gcm_evp_decrypter.cpp
+++ b/yass/src/crypto/aes_192_gcm_evp_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 24;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/aes_192_gcm_evp_encrypter.cpp b/yass/src/crypto/aes_192_gcm_evp_encrypter.cpp
index 806e0e1345..c6a311a8c8 100644
--- a/yass/src/crypto/aes_192_gcm_evp_encrypter.cpp
+++ b/yass/src/crypto/aes_192_gcm_evp_encrypter.cpp
@@ -4,8 +4,8 @@
 #include "crypto/aes_192_gcm_evp_encrypter.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 24;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/aes_256_gcm_evp_decrypter.cpp b/yass/src/crypto/aes_256_gcm_evp_decrypter.cpp
index 2790441e05..c99ef1eeae 100644
--- a/yass/src/crypto/aes_256_gcm_evp_decrypter.cpp
+++ b/yass/src/crypto/aes_256_gcm_evp_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/aes_256_gcm_evp_encrypter.cpp b/yass/src/crypto/aes_256_gcm_evp_encrypter.cpp
index f8d52f8e18..79736fba12 100644
--- a/yass/src/crypto/aes_256_gcm_evp_encrypter.cpp
+++ b/yass/src/crypto/aes_256_gcm_evp_encrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/aes_256_gcm_sodium_decrypter.cpp b/yass/src/crypto/aes_256_gcm_sodium_decrypter.cpp
index de8fff9ef3..70622965a1 100644
--- a/yass/src/crypto/aes_256_gcm_sodium_decrypter.cpp
+++ b/yass/src/crypto/aes_256_gcm_sodium_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/aes_256_gcm_sodium_encrypter.cpp b/yass/src/crypto/aes_256_gcm_sodium_encrypter.cpp
index dc2cb3cb94..0944912fcb 100644
--- a/yass/src/crypto/aes_256_gcm_sodium_encrypter.cpp
+++ b/yass/src/crypto/aes_256_gcm_sodium_encrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/chacha20_poly1305_evp_decrypter.cpp b/yass/src/crypto/chacha20_poly1305_evp_decrypter.cpp
index 212705d860..835143a752 100644
--- a/yass/src/crypto/chacha20_poly1305_evp_decrypter.cpp
+++ b/yass/src/crypto/chacha20_poly1305_evp_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/chacha20_poly1305_evp_encrypter.cpp b/yass/src/crypto/chacha20_poly1305_evp_encrypter.cpp
index e3ae82b3cf..b551719491 100644
--- a/yass/src/crypto/chacha20_poly1305_evp_encrypter.cpp
+++ b/yass/src/crypto/chacha20_poly1305_evp_encrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/chacha20_poly1305_sodium_decrypter.cpp b/yass/src/crypto/chacha20_poly1305_sodium_decrypter.cpp
index 4994c5045d..92d60e5199 100644
--- a/yass/src/crypto/chacha20_poly1305_sodium_decrypter.cpp
+++ b/yass/src/crypto/chacha20_poly1305_sodium_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/chacha20_poly1305_sodium_encrypter.cpp b/yass/src/crypto/chacha20_poly1305_sodium_encrypter.cpp
index 41ae9926a0..ba84f08f55 100644
--- a/yass/src/crypto/chacha20_poly1305_sodium_encrypter.cpp
+++ b/yass/src/crypto/chacha20_poly1305_sodium_encrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 12;
diff --git a/yass/src/crypto/crypter_export.hpp b/yass/src/crypto/crypter_export.hpp
index 03d1ec6a05..190ab09a00 100644
--- a/yass/src/crypto/crypter_export.hpp
+++ b/yass/src/crypto/crypter_export.hpp
@@ -64,6 +64,26 @@
 #define CIPHER_METHOD_MAP_HTTP2(XX)
 #endif
 
+#ifdef HAVE_QUICHE
+#define CIPHER_METHOD_IS_HTTP2(m) ((m) == CRYPTO_HTTP2_PLAINTEXT || (m) == CRYPTO_HTTP2)
+#define CIPHER_METHOD_IS_TLS(m) ((m) == CRYPTO_HTTPS || (m) == CRYPTO_HTTP2)
+#define CIPHER_METHOD_IS_HTTPS_FALLBACK(m) ((m) == CRYPTO_HTTPS)
+#else
+#define CIPHER_METHOD_IS_HTTP2(m) false
+#define CIPHER_METHOD_IS_TLS(m) ((m) == CRYPTO_HTTPS)
+#define CIPHER_METHOD_IS_HTTPS_FALLBACK(m) ((m) == CRYPTO_HTTPS)
+#endif
+
+#ifdef HAVE_QUICHE
+#define CRYPTO_DEFAULT CRYPTO_HTTP2
+#elif defined(HAVE_BORINGSSL)
+#define CRYPTO_DEFAULT CRYPTO_AES256GCMSHA256
+#elif defined(HAVE_MBEDTLS)
+#define CRYPTO_DEFAULT CHACHA20POLY1305IETF_EVP
+#else
+#error missing cipher method backend
+#endif
+
 #define CIPHER_METHOD_OLD_MAP(XX) \
   CIPHER_METHOD_MAP_SODIUM(XX)    \
   CIPHER_METHOD_MAP_BORINGSSL(XX) \
diff --git a/yass/src/crypto/xchacha20_poly1305_evp_decrypter.cpp b/yass/src/crypto/xchacha20_poly1305_evp_decrypter.cpp
index 772b227d6c..383d150f35 100644
--- a/yass/src/crypto/xchacha20_poly1305_evp_decrypter.cpp
+++ b/yass/src/crypto/xchacha20_poly1305_evp_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 24;
diff --git a/yass/src/crypto/xchacha20_poly1305_evp_encrypter.cpp b/yass/src/crypto/xchacha20_poly1305_evp_encrypter.cpp
index 872e991cff..aa0064093d 100644
--- a/yass/src/crypto/xchacha20_poly1305_evp_encrypter.cpp
+++ b/yass/src/crypto/xchacha20_poly1305_evp_encrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 24;
diff --git a/yass/src/crypto/xchacha20_poly1305_sodium_decrypter.cpp b/yass/src/crypto/xchacha20_poly1305_sodium_decrypter.cpp
index d2c55f1e05..ed4f5b4fc1 100644
--- a/yass/src/crypto/xchacha20_poly1305_sodium_decrypter.cpp
+++ b/yass/src/crypto/xchacha20_poly1305_sodium_decrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 24;
diff --git a/yass/src/crypto/xchacha20_poly1305_sodium_encrypter.cpp b/yass/src/crypto/xchacha20_poly1305_sodium_encrypter.cpp
index 6002c04105..9e017ef059 100644
--- a/yass/src/crypto/xchacha20_poly1305_sodium_encrypter.cpp
+++ b/yass/src/crypto/xchacha20_poly1305_sodium_encrypter.cpp
@@ -6,8 +6,8 @@
 #include "core/logging.hpp"
 
 #ifdef HAVE_BORINGSSL
-#include <openssl/aead.h>
 #include "crypto/crypter_export.hpp"
+#include "third_party/boringssl/src/include/openssl/aead.h"
 
 static const size_t kKeySize = 32;
 static const size_t kNonceSize = 24;
diff --git a/yass/src/gtk/yass.cpp b/yass/src/gtk/yass.cpp
index dd16992514..f0200ac77c 100644
--- a/yass/src/gtk/yass.cpp
+++ b/yass/src/gtk/yass.cpp
@@ -14,8 +14,8 @@
 #include <glib-2.0/glib-unix.h>
 #include <glib/gi18n.h>
 #include <locale.h>
-#include <openssl/crypto.h>
 #include <stdarg.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #include "core/logging.hpp"
 #include "core/utils.hpp"
diff --git a/yass/src/gtk4/yass.cpp b/yass/src/gtk4/yass.cpp
index 372b99aa26..ed29e10428 100644
--- a/yass/src/gtk4/yass.cpp
+++ b/yass/src/gtk4/yass.cpp
@@ -14,8 +14,8 @@
 #include <glib-2.0/glib-unix.h>
 #include <glib/gi18n.h>
 #include <locale.h>
-#include <openssl/crypto.h>
 #include <stdarg.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #include "core/logging.hpp"
 #include "core/utils.hpp"
diff --git a/yass/src/mac/main.mm b/yass/src/mac/main.mm
index 695abe5415..7461c4c21a 100644
--- a/yass/src/mac/main.mm
+++ b/yass/src/mac/main.mm
@@ -13,7 +13,7 @@
 #include <absl/flags/flag.h>
 #include <absl/flags/parse.h>
 #include <absl/strings/str_cat.h>
-#include <openssl/crypto.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #include "config/config.hpp"
 #include "core/logging.hpp"
diff --git a/yass/src/net/asio.hpp b/yass/src/net/asio.hpp
index e12167ed89..565a81cc17 100644
--- a/yass/src/net/asio.hpp
+++ b/yass/src/net/asio.hpp
@@ -35,7 +35,7 @@
 #include <asio.hpp>
 #ifndef ASIO_NO_SSL
 void print_openssl_error();
-#include <openssl/ssl.h>
+#include "third_party/boringssl/src/include/openssl/ssl.h"
 #endif
 #include "net/asio_throw_exceptions.hpp"
 
diff --git a/yass/src/net/base64.cpp b/yass/src/net/base64.cpp
index 86448f3a47..f73228bd02 100644
--- a/yass/src/net/base64.cpp
+++ b/yass/src/net/base64.cpp
@@ -5,7 +5,7 @@
 
 #include <stddef.h>
 
-#include <openssl/base64.h>
+#include "third_party/boringssl/src/include/openssl/base64.h"
 
 namespace net {
 
diff --git a/yass/src/net/cipher.cpp b/yass/src/net/cipher.cpp
index 2c45e879d7..0ac5bd3374 100644
--- a/yass/src/net/cipher.cpp
+++ b/yass/src/net/cipher.cpp
@@ -5,8 +5,8 @@
 
 #include <memory>
 
-#include <openssl/base64.h>
-#include <openssl/md5.h>
+#include "third_party/boringssl/src/include/openssl/base64.h"
+#include "third_party/boringssl/src/include/openssl/md5.h"
 
 #include "core/logging.hpp"
 #include "core/rand_util.hpp"
diff --git a/yass/src/net/content_server.hpp b/yass/src/net/content_server.hpp
index 78646ff3e6..0f4e64193f 100644
--- a/yass/src/net/content_server.hpp
+++ b/yass/src/net/content_server.hpp
@@ -56,12 +56,10 @@ class ContentServer {
         remote_host_ips_(remote_host_ips),
         remote_host_sni_(remote_host_sni),
         remote_port_(remote_port),
-        upstream_https_fallback_(absl::GetFlag(FLAGS_method).method == CRYPTO_HTTPS),
-        https_fallback_(absl::GetFlag(FLAGS_method).method == CRYPTO_HTTPS),
-        enable_upstream_tls_(absl::GetFlag(FLAGS_method).method == CRYPTO_HTTPS ||
-                             absl::GetFlag(FLAGS_method).method == CRYPTO_HTTP2),
-        enable_tls_(absl::GetFlag(FLAGS_method).method == CRYPTO_HTTPS ||
-                    absl::GetFlag(FLAGS_method).method == CRYPTO_HTTP2),
+        upstream_https_fallback_(CIPHER_METHOD_IS_HTTPS_FALLBACK(absl::GetFlag(FLAGS_method).method)),
+        https_fallback_(upstream_https_fallback_),
+        enable_upstream_tls_(CIPHER_METHOD_IS_TLS(absl::GetFlag(FLAGS_method).method)),
+        enable_tls_(enable_upstream_tls_),
         upstream_certificate_(upstream_certificate),
         certificate_(certificate),
         private_key_(private_key),
diff --git a/yass/src/net/doh_request.cpp b/yass/src/net/doh_request.cpp
index 38a9cc94a7..1bff7117c4 100644
--- a/yass/src/net/doh_request.cpp
+++ b/yass/src/net/doh_request.cpp
@@ -54,12 +54,27 @@ void DoHRequest::DoRequest(dns_message::DNStype dns_type, const std::string& hos
     return;
   }
   buf_ = IOBuf::create(SOCKET_BUF_SIZE);
+
   for (auto buffer : msg.buffers()) {
     buf_->reserve(0, buffer.size());
     memcpy(buf_->mutable_tail(), buffer.data(), buffer.size());
     buf_->append(buffer.size());
   }
 
+  {
+    std::string request_header = absl::StrFormat(
+        "POST %s HTTP/1.1\r\n"
+        "Host: %s:%d\r\n"
+        "Accept: */*\r\n"
+        "Content-Type: application/dns-message\r\n"
+        "Content-Length: %lu\r\n"
+        "\r\n",
+        doh_path_, doh_host_, doh_port_, buf_->length());
+    buf_->reserve(request_header.size(), 0);
+    memcpy(buf_->mutable_buffer(), request_header.c_str(), request_header.size());
+    buf_->prepend(request_header.size());
+  }
+
   asio::error_code ec;
   socket_.open(endpoint_.protocol(), ec);
   if (ec) {
@@ -107,17 +122,6 @@ void DoHRequest::OnSocketConnect() {
 }
 
 void DoHRequest::OnSSLConnect() {
-  std::string request_header = absl::StrFormat(
-      "POST %s HTTP/1.1\r\n"
-      "Host: %s:%d\r\n"
-      "Accept: */*\r\n"
-      "Content-Type: application/dns-message\r\n"
-      "Content-Length: %lu\r\n"
-      "\r\n",
-      doh_path_, doh_host_, doh_port_, buf_->length());
-  buf_->reserve(request_header.size(), 0);
-  memcpy(buf_->mutable_buffer(), request_header.c_str(), request_header.size());
-  buf_->prepend(request_header.size());
   scoped_refptr<DoHRequest> self(this);
 
   recv_buf_ = IOBuf::create(UINT16_MAX);
diff --git a/yass/src/net/dot_request.cpp b/yass/src/net/dot_request.cpp
index 4da37d63cf..7218d0c4ed 100644
--- a/yass/src/net/dot_request.cpp
+++ b/yass/src/net/dot_request.cpp
@@ -53,12 +53,20 @@ void DoTRequest::DoRequest(dns_message::DNStype dns_type, const std::string& hos
     return;
   }
   buf_ = IOBuf::create(SOCKET_BUF_SIZE);
+
   for (auto buffer : msg.buffers()) {
     buf_->reserve(0, buffer.size());
     memcpy(buf_->mutable_tail(), buffer.data(), buffer.size());
     buf_->append(buffer.size());
   }
 
+  {
+    uint16_t length = htons(buf_->length());
+    buf_->reserve(sizeof(length), 0);
+    memcpy(buf_->mutable_buffer(), &length, sizeof(length));
+    buf_->prepend(sizeof(length));
+  }
+
   asio::error_code ec;
   socket_.open(endpoint_.protocol(), ec);
   if (ec) {
@@ -106,14 +114,9 @@ void DoTRequest::OnSocketConnect() {
 }
 
 void DoTRequest::OnSSLConnect() {
-  uint16_t length = htons(buf_->length());
-  buf_->reserve(sizeof(length), 0);
-  memcpy(buf_->mutable_buffer(), &length, sizeof(length));
-  buf_->prepend(sizeof(length));
-
   scoped_refptr<DoTRequest> self(this);
 
-  recv_buf_ = IOBuf::create(sizeof(length) + UINT16_MAX);
+  recv_buf_ = IOBuf::create(sizeof(uint16_t) + UINT16_MAX);
   ssl_socket_->WaitWrite([this, self](asio::error_code ec) { OnSSLWritable(ec); });
   ssl_socket_->WaitRead([this, self](asio::error_code ec) { OnSSLReadable(ec); });
 }
diff --git a/yass/src/net/hmac_sha1.hpp b/yass/src/net/hmac_sha1.hpp
index 7524b76e30..0b122b5991 100644
--- a/yass/src/net/hmac_sha1.hpp
+++ b/yass/src/net/hmac_sha1.hpp
@@ -3,7 +3,7 @@
 #ifndef H_NET_HMAC_SHA1
 #define H_NET_HMAC_SHA1
 
-#include <openssl/sha.h>
+#include "third_party/boringssl/src/include/openssl/sha.h"
 
 #define HASH_BLOCK_SIZE 128
 #define HASH_BLOCK_SIZE_256 64
diff --git a/yass/src/net/openssl_util.cpp b/yass/src/net/openssl_util.cpp
index 534a263fbb..201ed0c19e 100644
--- a/yass/src/net/openssl_util.cpp
+++ b/yass/src/net/openssl_util.cpp
@@ -4,10 +4,10 @@
 #include "net/openssl_util.hpp"
 #include "net/net_errors.hpp"
 
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/ssl.h>
 #include "core/logging.hpp"
+#include "third_party/boringssl/src/include/openssl/crypto.h"
+#include "third_party/boringssl/src/include/openssl/err.h"
+#include "third_party/boringssl/src/include/openssl/ssl.h"
 
 namespace net {
 
diff --git a/yass/src/net/ssl_server_socket.cpp b/yass/src/net/ssl_server_socket.cpp
index 0f250b0cef..7a99e1f858 100644
--- a/yass/src/net/ssl_server_socket.cpp
+++ b/yass/src/net/ssl_server_socket.cpp
@@ -3,8 +3,8 @@
 
 #include "net/ssl_server_socket.hpp"
 
-#include <openssl/err.h>
 #include "net/openssl_util.hpp"
+#include "third_party/boringssl/src/include/openssl/err.h"
 
 #define GotoState(s) next_handshake_state_ = s
 
diff --git a/yass/src/net/ssl_server_socket.hpp b/yass/src/net/ssl_server_socket.hpp
index 246ca5fbeb..5f5bb6fb0b 100644
--- a/yass/src/net/ssl_server_socket.hpp
+++ b/yass/src/net/ssl_server_socket.hpp
@@ -5,7 +5,7 @@
 #define H_NET_SSL_SERVER_SOCKET
 
 #include <absl/functional/any_invocable.h>
-#include <openssl/ssl.h>
+#include "third_party/boringssl/src/include/openssl/ssl.h"
 
 #include "core/ref_counted.hpp"
 #include "core/scoped_refptr.hpp"
diff --git a/yass/src/net/ssl_socket.hpp b/yass/src/net/ssl_socket.hpp
index 58457b2793..7b0945d7fa 100644
--- a/yass/src/net/ssl_socket.hpp
+++ b/yass/src/net/ssl_socket.hpp
@@ -5,7 +5,7 @@
 #define H_NET_SSL_SOCKET
 
 #include <absl/functional/any_invocable.h>
-#include <openssl/ssl.h>
+#include "third_party/boringssl/src/include/openssl/ssl.h"
 
 #include "core/ref_counted.hpp"
 #include "core/scoped_refptr.hpp"
diff --git a/yass/src/net/x509_util.hpp b/yass/src/net/x509_util.hpp
index c57b9b78cc..17ad875fbd 100644
--- a/yass/src/net/x509_util.hpp
+++ b/yass/src/net/x509_util.hpp
@@ -4,9 +4,9 @@
 #ifndef H_NET_X509_UTIL
 #define H_NET_X509_UTIL
 
-#include <openssl/base.h>
-#include <openssl/pool.h>
 #include <string_view>
+#include "third_party/boringssl/src/include/openssl/base.h"
+#include "third_party/boringssl/src/include/openssl/pool.h"
 
 namespace net::x509_util {
 
diff --git a/yass/src/server/server.cpp b/yass/src/server/server.cpp
index 5f0076f6ea..a821459dc5 100644
--- a/yass/src/server/server.cpp
+++ b/yass/src/server/server.cpp
@@ -11,7 +11,7 @@
 #include <absl/flags/parse.h>
 #include <absl/strings/str_cat.h>
 #include <locale.h>
-#include <openssl/crypto.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #ifndef _WIN32
 #include <grp.h>
@@ -84,7 +84,7 @@ int main(int argc, const char* argv[]) {
 
   // raise some early warning on SSL server setups
   auto method = absl::GetFlag(FLAGS_method).method;
-  if (method == cipher_method::CRYPTO_HTTPS || method == cipher_method::CRYPTO_HTTP2) {
+  if (CIPHER_METHOD_IS_TLS(method)) {
     ssize_t ret;
     std::string private_key, private_key_path = absl::GetFlag(FLAGS_private_key_file);
     if (private_key_path.empty()) {
diff --git a/yass/src/server/server_connection.cpp b/yass/src/server/server_connection.cpp
index 201ab69339..421b203ca9 100644
--- a/yass/src/server/server_connection.cpp
+++ b/yass/src/server/server_connection.cpp
@@ -23,6 +23,7 @@ using namespace net;
 
 using gurl_base::ToLowerASCII;
 
+#ifdef HAVE_QUICHE
 static void SplitHostPort(std::string* out_hostname, std::string* out_port, const std::string& hostname_and_port) {
   size_t colon_offset = hostname_and_port.find_last_of(':');
   const size_t bracket_offset = hostname_and_port.find_last_of(']');
@@ -67,10 +68,13 @@ static std::string GetProxyAuthorizationIdentity() {
   return result;
 }
 
+#endif
+
 namespace server {
 
 const char ServerConnection::http_connect_reply_[] = "HTTP/1.1 200 Connection established\r\n\r\n";
 
+#ifdef HAVE_QUICHE
 bool DataFrameSource::Send(absl::string_view frame_header, size_t payload_length) {
   std::string concatenated;
   if (payload_length) {
@@ -122,6 +126,8 @@ bool DataFrameSource::Send(absl::string_view frame_header, size_t payload_length
   return true;
 }
 
+#endif
+
 ServerConnection::ServerConnection(asio::io_context& io_context,
                                    const std::string& remote_host_ips,
                                    const std::string& remote_host_sni,
@@ -178,6 +184,7 @@ void ServerConnection::close() {
   asio::error_code ec;
   closing_ = true;
 
+#ifdef HAVE_QUICHE
   if (adapter_) {
     if (data_frame_) {
       data_frame_->set_last_frame(true);
@@ -191,6 +198,7 @@ void ServerConnection::close() {
     SendIfNotProcessing();
     WriteStreamInPipe();
   }
+#endif
   closed_ = true;
   if (enable_tls_ && !shutdown_) {
     shutdown_ = true;
@@ -206,11 +214,12 @@ void ServerConnection::close() {
 }
 
 void ServerConnection::Start() {
-  bool http2 = absl::GetFlag(FLAGS_method).method == CRYPTO_HTTP2_PLAINTEXT;
-  http2 |= absl::GetFlag(FLAGS_method).method == CRYPTO_HTTP2;
+  const auto method = absl::GetFlag(FLAGS_method).method;
+  bool http2 = CIPHER_METHOD_IS_HTTP2(method);
   if (http2 && downlink_->https_fallback()) {
     http2 = false;
   }
+#ifdef HAVE_QUICHE
   if (http2) {
 #ifdef HAVE_NGHTTP2
     adapter_ = http2::adapter::NgHttp2Adapter::CreateServerAdapter(*this);
@@ -235,11 +244,15 @@ void ServerConnection::Start() {
 
     WriteUpstreamInPipe();
     OnUpstreamWriteFlush();
-  } else if (downlink_->https_fallback()) {
+  } else
+#endif
+      if (downlink_->https_fallback()) {
+    DCHECK(!http2);
     // TODO should we support it?
     // padding_support_ = absl::GetFlag(FLAGS_padding_support);
     ReadHandshakeViaHttps();
   } else {
+    DCHECK(!http2);
     encoder_ =
         std::make_unique<cipher>("", absl::GetFlag(FLAGS_password), absl::GetFlag(FLAGS_method).method, this, true);
     decoder_ = std::make_unique<cipher>("", absl::GetFlag(FLAGS_password), absl::GetFlag(FLAGS_method).method, this);
@@ -247,6 +260,7 @@ void ServerConnection::Start() {
   }
 }
 
+#ifdef HAVE_QUICHE
 void ServerConnection::SendIfNotProcessing() {
   if (!processing_responses_) {
     processing_responses_ = true;
@@ -254,6 +268,7 @@ void ServerConnection::SendIfNotProcessing() {
     processing_responses_ = false;
   }
 }
+#endif
 
 //
 // cipher_visitor_interface
@@ -280,6 +295,7 @@ void ServerConnection::on_protocol_error() {
   OnDisconnect(asio::error::connection_aborted);
 }
 
+#ifdef HAVE_QUICHE
 //
 // http2::adapter::Http2VisitorInterface
 //
@@ -473,6 +489,8 @@ bool ServerConnection::OnMetadataEndForStream(StreamId stream_id) {
   return true;
 }
 
+#endif
+
 void ServerConnection::ReadHandshake() {
   scoped_refptr<ServerConnection> self(this);
 
@@ -831,6 +849,7 @@ std::shared_ptr<IOBuf> ServerConnection::GetNextDownstreamBuf(asio::error_code&
   }
   *bytes_transferred += read;
 
+#ifdef HAVE_QUICHE
   if (adapter_) {
     if (!data_frame_) {
       ec = asio::error::eof;
@@ -841,18 +860,22 @@ std::shared_ptr<IOBuf> ServerConnection::GetNextDownstreamBuf(asio::error_code&
       AddPadding(buf);
     }
     data_frame_->AddChunk(buf);
-  } else if (downlink_->https_fallback()) {
+  } else
+#endif
+      if (downlink_->https_fallback()) {
     downstream_.push_back(buf);
   } else {
     EncryptData(&downstream_, buf);
   }
 
 out:
+#ifdef HAVE_QUICHE
   if (data_frame_ && *bytes_transferred) {
     data_frame_->SetSendCompletionCallback(std::function<void()>());
     adapter_->ResumeStream(stream_id_);
     SendIfNotProcessing();
   }
+#endif
   if (downstream_.empty()) {
     if (!ec) {
       ec = asio::error::try_again;
@@ -957,7 +980,9 @@ std::shared_ptr<IOBuf> ServerConnection::GetNextUpstreamBuf(asio::error_code& ec
     return nullptr;
   }
 
+#ifdef HAVE_QUICHE
 try_again:
+#endif
   // RstStream might be sent in ProcessBytes
   if (closed_ || closing_) {
     ec = asio::error::eof;
@@ -986,6 +1011,7 @@ try_again:
     goto out;
   }
 
+#ifdef HAVE_QUICHE
   if (adapter_) {
     absl::string_view remaining_buffer(reinterpret_cast<const char*>(buf->data()), buf->length());
     while (!remaining_buffer.empty()) {
@@ -1001,18 +1027,22 @@ try_again:
     if (upstream_.byte_length() < H2_STREAM_WINDOW_SIZE) {
       goto try_again;
     }
-  } else if (downlink_->https_fallback()) {
+  } else
+#endif
+      if (downlink_->https_fallback()) {
     upstream_.push_back(buf);
   } else {
     decoder_->process_bytes(buf);
   }
 
 out:
+#ifdef HAVE_QUICHE
   if (adapter_ && adapter_->want_write()) {
     // Send Control Streams
     SendIfNotProcessing();
     WriteStreamInPipe();
   }
+#endif
   if (upstream_.empty()) {
     if (!ec) {
       ec = asio::error::try_again;
@@ -1127,6 +1157,7 @@ void ServerConnection::OnConnect() {
     }
     connected();
   });
+#ifdef HAVE_QUICHE
   if (adapter_) {
     // stream is ready
     std::unique_ptr<DataFrameSource> data_frame = std::make_unique<DataFrameSource>(this, stream_id_);
@@ -1148,7 +1179,9 @@ void ServerConnection::OnConnect() {
     if (submit_result != 0) {
       OnDisconnect(asio::error::connection_aborted);
     }
-  } else if (downlink_->https_fallback() && http_is_connect_) {
+  } else
+#endif
+      if (downlink_->https_fallback() && http_is_connect_) {
     std::shared_ptr<IOBuf> buf = IOBuf::copyBuffer(http_connect_reply_, sizeof(http_connect_reply_) - 1);
     OnDownstreamWrite(buf);
   }
@@ -1159,15 +1192,22 @@ void ServerConnection::OnStreamRead(std::shared_ptr<IOBuf> buf) {
 }
 
 void ServerConnection::OnStreamWrite() {
+#ifdef HAVE_QUICHE
   if (blocked_stream_) {
     adapter_->ResumeStream(blocked_stream_);
     SendIfNotProcessing();
   }
+#endif
+#ifdef HAVE_QUICHE
   /* shutdown the socket if upstream is eof and all remaining data sent */
   bool nodata = !data_frame_ || !data_frame_->SelectPayloadLength(1).first;
+#else
+  bool nodata = true;
+#endif
   if (channel_ && channel_->eof() && nodata && downstream_.empty() && !shutdown_) {
     VLOG(2) << "Connection (server) " << connection_id() << " last data sent: shutting down";
     shutdown_ = true;
+#ifdef HAVE_QUICHE
     if (data_frame_) {
       data_frame_->set_last_frame(true);
       adapter_->ResumeStream(stream_id_);
@@ -1177,6 +1217,7 @@ void ServerConnection::OnStreamWrite() {
       WriteStreamInPipe();
       return;
     }
+#endif
     scoped_refptr<ServerConnection> self(this);
     downlink_->async_shutdown([this, self](asio::error_code ec) {
       if (closed_ || closing_) {
@@ -1293,10 +1334,15 @@ void ServerConnection::disconnected(asio::error_code ec) {
   upstream_writable_ = false;
   channel_->close();
   /* delay the socket's close because downstream is buffered */
+#ifdef HAVE_QUICHE
   bool nodata = !data_frame_ || !data_frame_->SelectPayloadLength(1).first;
+#else
+  bool nodata = true;
+#endif
   if (nodata && downstream_.empty() && !shutdown_) {
     VLOG(2) << "Connection (server) " << connection_id() << " upstream: last data sent: shutting down";
     shutdown_ = true;
+#ifdef HAVE_QUICHE
     if (data_frame_) {
       data_frame_->set_last_frame(true);
       adapter_->ResumeStream(stream_id_);
@@ -1306,6 +1352,7 @@ void ServerConnection::disconnected(asio::error_code ec) {
       WriteStreamInPipe();
       return;
     }
+#endif
     scoped_refptr<ServerConnection> self(this);
     downlink_->async_shutdown([this, self](asio::error_code ec) {
       if (closed_ || closing_) {
diff --git a/yass/src/server/server_connection.hpp b/yass/src/server/server_connection.hpp
index 03efcb8f95..fc4fb485c3 100644
--- a/yass/src/server/server_connection.hpp
+++ b/yass/src/server/server_connection.hpp
@@ -24,11 +24,13 @@
 #include <absl/strings/string_view.h>
 #include <deque>
 
+#ifdef HAVE_QUICHE
 #ifdef HAVE_NGHTTP2
 #include <quiche/http2/adapter/nghttp2_adapter.h>
 #else
 #include <quiche/http2/adapter/oghttp2_adapter.h>
 #endif
+#endif
 
 class cipher;
 namespace server {
@@ -37,12 +39,15 @@ using IOBuf = net::IOBuf;
 using cipher = net::cipher;
 using IoQueue = net::IoQueue;
 
+#ifdef HAVE_QUICHE
 using StreamId = http2::adapter::Http2StreamId;
 template <typename T>
 using StreamMap = absl::flat_hash_map<StreamId, T>;
+#endif
 
 class ServerConnection;
 
+#ifdef HAVE_QUICHE
 class DataFrameSource : public http2::adapter::DataFrameSource {
  public:
   explicit DataFrameSource(ServerConnection* connection, const StreamId& stream_id)
@@ -75,14 +80,17 @@ class DataFrameSource : public http2::adapter::DataFrameSource {
   bool last_frame_ = false;
   std::function<void()> send_completion_callback_;
 };
+#endif
 
 /// The ultimate service class to deliever the network traffic to the remote
 /// endpoint
 class ServerConnection : public RefCountedThreadSafe<ServerConnection>,
+#ifdef HAVE_QUICHE
+                         public http2::adapter::Http2VisitorInterface,
+#endif
                          public net::Channel,
                          public net::Connection,
-                         public net::cipher_visitor_interface,
-                         public http2::adapter::Http2VisitorInterface {
+                         public net::cipher_visitor_interface {
  public:
   /// The state of service
   enum state {
@@ -155,6 +163,7 @@ class ServerConnection : public RefCountedThreadSafe<ServerConnection>,
   /// flag to mark connection is closed
   bool closed_ = true;
 
+#ifdef HAVE_QUICHE
  private:
   void SendIfNotProcessing();
   bool processing_responses_ = false;
@@ -163,12 +172,14 @@ class ServerConnection : public RefCountedThreadSafe<ServerConnection>,
 
  public:
   StreamId blocked_stream_ = 0;
+#endif
 
  public:
   // cipher_visitor_interface
   bool on_received_data(std::shared_ptr<IOBuf> buf) override;
   void on_protocol_error() override;
 
+#ifdef HAVE_QUICHE
  public:
   // http2::adapter::Http2VisitorInterface
   // OnBeforeFrameSent(SETTINGS, 0, _, 0x0)
@@ -217,6 +228,7 @@ class ServerConnection : public RefCountedThreadSafe<ServerConnection>,
   http2::adapter::NgHttp2Adapter* adapter() { return adapter_.get(); }
 #else
   http2::adapter::OgHttp2Adapter* adapter() { return adapter_.get(); }
+#endif
 #endif
 
  private:
@@ -336,6 +348,7 @@ class ServerConnection : public RefCountedThreadSafe<ServerConnection>,
   /// the upstream the service bound with
   scoped_refptr<net::stream> channel_;
 
+#ifdef HAVE_QUICHE
   /// the http2 upstream adapter
 #ifdef HAVE_NGHTTP2
   std::unique_ptr<http2::adapter::NgHttp2Adapter> adapter_;
@@ -343,6 +356,7 @@ class ServerConnection : public RefCountedThreadSafe<ServerConnection>,
   std::unique_ptr<http2::adapter::OgHttp2Adapter> adapter_;
 #endif
   absl::flat_hash_map<std::string, std::string> request_map_;
+#endif
 
   /// the queue to write downstream
   IoQueue downstream_;
diff --git a/yass/src/ss_benchmark.cpp b/yass/src/ss_benchmark.cpp
index 3d5cf904cc..8d412b0952 100644
--- a/yass/src/ss_benchmark.cpp
+++ b/yass/src/ss_benchmark.cpp
@@ -8,7 +8,7 @@
 #include <absl/flags/flag.h>
 #include <absl/flags/parse.h>
 #include <absl/strings/str_format.h>
-#include <openssl/crypto.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #ifdef _MSC_VER
 #include <crtdbg.h>
diff --git a/yass/src/ss_test.cpp b/yass/src/ss_test.cpp
index a542d5de02..68c77ac5c8 100644
--- a/yass/src/ss_test.cpp
+++ b/yass/src/ss_test.cpp
@@ -11,7 +11,7 @@
 #include <absl/flags/flag.h>
 #include <absl/flags/parse.h>
 #include <absl/strings/str_format.h>
-#include <openssl/crypto.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #ifdef _MSC_VER
 #include <crtdbg.h>
diff --git a/yass/src/win32/yass.cpp b/yass/src/win32/yass.cpp
index 52e0f3aaaf..c23bab1cc0 100644
--- a/yass/src/win32/yass.cpp
+++ b/yass/src/win32/yass.cpp
@@ -13,7 +13,7 @@
 #include <absl/flags/parse.h>
 #include <absl/strings/str_cat.h>
 #include <locale.h>
-#include <openssl/crypto.h>
+#include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #include "core/debug.hpp"
 #include "core/logging.hpp"