diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 025ff1f189..5d2bccd28f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2020-2025 Status Research & Development GmbH
+# Copyright (c) 2020-2026 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -107,6 +107,13 @@ jobs:
           # for miniupnp that runs "wingenminiupnpcstrings.exe" from the current dir
           echo "." >> $GITHUB_PATH
 
+      - name: Install nasm (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          choco install nasm --no-progress -y
+          "C:\Program Files\NASM" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
+
       - name: Derive environment variables
         run: |
           if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
diff --git a/.gitmodules b/.gitmodules
index fc16bc81a4..9e2e84c545 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2019-2025 Status Research & Development GmbH
+# Copyright (c) 2019-2026 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).
@@ -229,13 +229,9 @@
 	url = https://github.com/eth-clients/hoodi
 	ignore = untracked
 	branch = main
-[submodule "vendor/nim-ngtcp2"]
-	path = vendor/nim-ngtcp2
-	url = https://github.com/vacp2p/nim-ngtcp2
-	branch = main
-[submodule "vendor/nim-quic"]
-	path = vendor/nim-quic
-	url = https://github.com/vacp2p/nim-quic
+[submodule "vendor/nim-lsquic"]
+	path = vendor/nim-lsquic
+	url = https://github.com/vacp2p/nim-lsquic
 	branch = main
 [submodule "vendor/nim-intops"]
 	path = vendor/nim-intops
diff --git a/config.nims b/config.nims
index c699a3bd99..e432857061 100644
--- a/config.nims
+++ b/config.nims
@@ -76,9 +76,6 @@ if defined(windows):
   switch("passL", "-Wl,--stack,8388608")
   # https://github.com/nim-lang/Nim/issues/4057
   --tlsEmulation:off
-  if defined(i386):
-    # set the IMAGE_FILE_LARGE_ADDRESS_AWARE flag so we can use PAE, if enabled, and access more than 2 GiB of RAM
-    switch("passL", "-Wl,--large-address-aware")
 
   # The dynamic Chronicles output currently prevents us from using colors on Windows
   # because these require direct manipulations of the stdout File object.
@@ -225,3 +222,13 @@ put("sysrng.always", "-fno-lto")
 # sqlite3.c: In function ‘sqlite3SelectNew’:
 # vendor/nim-sqlite3-abi/sqlite3.c:124500: warning: function may return address of local variable [-Wreturn-local-addr]
 put("sqlite3.always", "-fno-lto") # -Wno-return-local-addr
+
+# ############################################################
+#
+#                QUIC does variable stack allocations
+#
+# ############################################################
+
+put("lsquic_enc_sess_ietf.always", "-fno-lto -Wno-stack-usage")
+put("lsquic_handshake.always", "-fno-lto -Wno-stack-usage")
+put("lsquic_hkdf.always", "-fno-lto -Wno-stack-usage")
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index aa8ce46f78..d12cac1b8f 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit aa8ce46f782240cb99a7222c474022b8cfd24e52
+Subproject commit d12cac1b8fcf648da573170f000c9822e87a07eb
diff --git a/vendor/nim-lsquic b/vendor/nim-lsquic
new file mode 160000
index 0000000000..4fb03ee7bf
--- /dev/null
+++ b/vendor/nim-lsquic
@@ -0,0 +1 @@
+Subproject commit 4fb03ee7bfb39aecb3316889fdcb60bec3d0936f
diff --git a/vendor/nim-ngtcp2 b/vendor/nim-ngtcp2
deleted file mode 160000
index 791eb85914..0000000000
--- a/vendor/nim-ngtcp2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 791eb859145f9f268eb23eb9cbe777bdd7699c4d
diff --git a/vendor/nim-quic b/vendor/nim-quic
deleted file mode 160000
index 6d8678a159..0000000000
--- a/vendor/nim-quic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6d8678a159bfb902f9725f0081d542134cd93916