diff --git a/bucket/xtensa-esp-elf.json b/bucket/xtensa-esp-elf.json
new file mode 100644
index 0000000000000..a89d0030d1e30
--- /dev/null
+++ b/bucket/xtensa-esp-elf.json
@@ -0,0 +1,156 @@
+{
+    "version": "13.2.0_20230928",
+    "description": "Toolchain for 32-bit Xtensa based on GCC",
+    "homepage": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/windows-setup-scratch.html",
+    "license": "GPL-3.0-with-GCC-exception",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-13.2.0_20230928/xtensa-esp-elf-13.2.0_20230928-x86_64-w64-mingw32.zip",
+            "hash": "80e3271b7c9b64694ba8494b90054da2efce328f7d4e5f5f625d08808372fa64"
+        },
+        "32bit": {
+            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-13.2.0_20230928/xtensa-esp-elf-13.2.0_20230928-i686-w64-mingw32.zip",
+            "hash": "7a2822ef554be175bbe5c67c2010a6dd29aec6221bdb5ed8970f164e2744714a"
+        }
+    },
+    "extract_dir": "xtensa-esp-elf",
+    "bin": [
+        "bin\\xtensa-esp-elf-addr2line.exe",
+        "bin\\xtensa-esp-elf-ar.exe",
+        "bin\\xtensa-esp-elf-as.exe",
+        "bin\\xtensa-esp-elf-c++.exe",
+        "bin\\xtensa-esp-elf-c++filt.exe",
+        "bin\\xtensa-esp-elf-cc.exe",
+        "bin\\xtensa-esp-elf-cpp.exe",
+        "bin\\xtensa-esp-elf-elfedit.exe",
+        "bin\\xtensa-esp-elf-g++.exe",
+        "bin\\xtensa-esp-elf-gcc-ar.exe",
+        "bin\\xtensa-esp-elf-gcc-nm.exe",
+        "bin\\xtensa-esp-elf-gcc-ranlib.exe",
+        "bin\\xtensa-esp-elf-gcc.exe",
+        "bin\\xtensa-esp-elf-gcov-dump.exe",
+        "bin\\xtensa-esp-elf-gcov-tool.exe",
+        "bin\\xtensa-esp-elf-gcov.exe",
+        "bin\\xtensa-esp-elf-gprof.exe",
+        "bin\\xtensa-esp-elf-ld.bfd.exe",
+        "bin\\xtensa-esp-elf-ld.exe",
+        "bin\\xtensa-esp-elf-lto-dump.exe",
+        "bin\\xtensa-esp-elf-nm.exe",
+        "bin\\xtensa-esp-elf-objcopy.exe",
+        "bin\\xtensa-esp-elf-objdump.exe",
+        "bin\\xtensa-esp-elf-ranlib.exe",
+        "bin\\xtensa-esp-elf-readelf.exe",
+        "bin\\xtensa-esp-elf-size.exe",
+        "bin\\xtensa-esp-elf-strings.exe",
+        "bin\\xtensa-esp-elf-strip.exe",
+
+        "bin\\xtensa-esp32-elf-addr2line.exe",
+        "bin\\xtensa-esp32-elf-ar.exe",
+        "bin\\xtensa-esp32-elf-as.exe",
+        "bin\\xtensa-esp32-elf-c++.exe",
+        "bin\\xtensa-esp32-elf-c++filt.exe",
+        "bin\\xtensa-esp32-elf-cc.exe",
+        "bin\\xtensa-esp32-elf-cpp.exe",
+        "bin\\xtensa-esp32-elf-elfedit.exe",
+        "bin\\xtensa-esp32-elf-g++.exe",
+        "bin\\xtensa-esp32-elf-gcc-ar.exe",
+        "bin\\xtensa-esp32-elf-gcc-nm.exe",
+        "bin\\xtensa-esp32-elf-gcc-ranlib.exe",
+        "bin\\xtensa-esp32-elf-gcc.exe",
+        "bin\\xtensa-esp32-elf-gcov-dump.exe",
+        "bin\\xtensa-esp32-elf-gcov-tool.exe",
+        "bin\\xtensa-esp32-elf-gcov.exe",
+        "bin\\xtensa-esp32-elf-gprof.exe",
+        "bin\\xtensa-esp32-elf-ld.bfd.exe",
+        "bin\\xtensa-esp32-elf-ld.exe",
+        "bin\\xtensa-esp32-elf-lto-dump.exe",
+        "bin\\xtensa-esp32-elf-nm.exe",
+        "bin\\xtensa-esp32-elf-objcopy.exe",
+        "bin\\xtensa-esp32-elf-objdump.exe",
+        "bin\\xtensa-esp32-elf-ranlib.exe",
+        "bin\\xtensa-esp32-elf-readelf.exe",
+        "bin\\xtensa-esp32-elf-size.exe",
+        "bin\\xtensa-esp32-elf-strings.exe",
+        "bin\\xtensa-esp32-elf-strip.exe",
+
+        "bin\\xtensa-esp32s2-elf-addr2line.exe",
+        "bin\\xtensa-esp32s2-elf-ar.exe",
+        "bin\\xtensa-esp32s2-elf-as.exe",
+        "bin\\xtensa-esp32s2-elf-c++.exe",
+        "bin\\xtensa-esp32s2-elf-c++filt.exe",
+        "bin\\xtensa-esp32s2-elf-cc.exe",
+        "bin\\xtensa-esp32s2-elf-cpp.exe",
+        "bin\\xtensa-esp32s2-elf-elfedit.exe",
+        "bin\\xtensa-esp32s2-elf-g++.exe",
+        "bin\\xtensa-esp32s2-elf-gcc-ar.exe",
+        "bin\\xtensa-esp32s2-elf-gcc-nm.exe",
+        "bin\\xtensa-esp32s2-elf-gcc-ranlib.exe",
+        "bin\\xtensa-esp32s2-elf-gcc.exe",
+        "bin\\xtensa-esp32s2-elf-gcov-dump.exe",
+        "bin\\xtensa-esp32s2-elf-gcov-tool.exe",
+        "bin\\xtensa-esp32s2-elf-gcov.exe",
+        "bin\\xtensa-esp32s2-elf-gprof.exe",
+        "bin\\xtensa-esp32s2-elf-ld.bfd.exe",
+        "bin\\xtensa-esp32s2-elf-ld.exe",
+        "bin\\xtensa-esp32s2-elf-lto-dump.exe",
+        "bin\\xtensa-esp32s2-elf-nm.exe",
+        "bin\\xtensa-esp32s2-elf-objcopy.exe",
+        "bin\\xtensa-esp32s2-elf-objdump.exe",
+        "bin\\xtensa-esp32s2-elf-ranlib.exe",
+        "bin\\xtensa-esp32s2-elf-readelf.exe",
+        "bin\\xtensa-esp32s2-elf-size.exe",
+        "bin\\xtensa-esp32s2-elf-strings.exe",
+        "bin\\xtensa-esp32s2-elf-strip.exe",
+
+        "bin\\xtensa-esp32s3-elf-addr2line.exe",
+        "bin\\xtensa-esp32s3-elf-ar.exe",
+        "bin\\xtensa-esp32s3-elf-as.exe",
+        "bin\\xtensa-esp32s3-elf-c++.exe",
+        "bin\\xtensa-esp32s3-elf-c++filt.exe",
+        "bin\\xtensa-esp32s3-elf-cc.exe",
+        "bin\\xtensa-esp32s3-elf-cpp.exe",
+        "bin\\xtensa-esp32s3-elf-elfedit.exe",
+        "bin\\xtensa-esp32s3-elf-g++.exe",
+        "bin\\xtensa-esp32s3-elf-gcc-ar.exe",
+        "bin\\xtensa-esp32s3-elf-gcc-nm.exe",
+        "bin\\xtensa-esp32s3-elf-gcc-ranlib.exe",
+        "bin\\xtensa-esp32s3-elf-gcc.exe",
+        "bin\\xtensa-esp32s3-elf-gcov-dump.exe",
+        "bin\\xtensa-esp32s3-elf-gcov-tool.exe",
+        "bin\\xtensa-esp32s3-elf-gcov.exe",
+        "bin\\xtensa-esp32s3-elf-gprof.exe",
+        "bin\\xtensa-esp32s3-elf-ld.bfd.exe",
+        "bin\\xtensa-esp32s3-elf-ld.exe",
+        "bin\\xtensa-esp32s3-elf-lto-dump.exe",
+        "bin\\xtensa-esp32s3-elf-nm.exe",
+        "bin\\xtensa-esp32s3-elf-objcopy.exe",
+        "bin\\xtensa-esp32s3-elf-objdump.exe",
+        "bin\\xtensa-esp32s3-elf-ranlib.exe",
+        "bin\\xtensa-esp32s3-elf-readelf.exe",
+        "bin\\xtensa-esp32s3-elf-size.exe",
+        "bin\\xtensa-esp32s3-elf-strings.exe",
+        "bin\\xtensa-esp32s3-elf-strip.exe"
+    ],
+    "checkver": {
+        "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-tools.html",
+        "regex": "xtensa-esp-elf-([\\d.]+_[\\d]+)-x86_64-w64-mingw32.zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-$version/xtensa-esp-elf-$version-x86_64-w64-mingw32.zip",
+                "hash": {
+                    "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-tools.html",
+                    "regex": "xtensa-esp-elf-$version-x86_64-w64-mingw32.zip.+\\s.+SHA256: $sha256"
+                }
+            },
+            "32bit": {
+                "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-$version/xtensa-esp-elf-$version-i686-w64-mingw32.zip",
+                "hash": {
+                    "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-tools.html",
+                    "regex": "xtensa-esp-elf-$version-i686-w64-mingw32.zip.+\\s.+SHA256: $sha256"
+                }
+            }
+        }
+    }
+}
diff --git a/bucket/xtensa-esp32-elf.json b/bucket/xtensa-esp32-elf.json
index 2b61fdebfb3e1..cda60d6159fc9 100644
--- a/bucket/xtensa-esp32-elf.json
+++ b/bucket/xtensa-esp32-elf.json
@@ -1,20 +1,50 @@
 {
-    "version": "11_2_0-esp-2022r1",
-    "description": "Toolchain for Xtensa (ESP32) based on GCC",
+    "version": "13.2.0_20230928",
+    "description": "Toolchain for 32-bit Xtensa based on GCC",
     "homepage": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/windows-setup-scratch.html",
-    "license": "GPL-2.0-or-later",
+    "license": "GPL-3.0-with-GCC-exception",
+    "notes": "This manifest is deprecated, use 'xtensa-esp-elf' instead.",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2022r1/xtensa-esp32-elf-gcc11_2_0-esp-2022r1-win64.zip",
-            "hash": "f469aff6a71113e3a145466d814184339e02248b158357766970646f5d2a3da7"
+            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-13.2.0_20230928/xtensa-esp-elf-13.2.0_20230928-x86_64-w64-mingw32.zip",
+            "hash": "80e3271b7c9b64694ba8494b90054da2efce328f7d4e5f5f625d08808372fa64"
         },
         "32bit": {
-            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2022r1/xtensa-esp32-elf-gcc11_2_0-esp-2022r1-win32.zip",
-            "hash": "858ee049d6d8de730ed3e30285c4adc1a9cdfe077b591ed0b6f2bfa5e3564f53"
+            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-13.2.0_20230928/xtensa-esp-elf-13.2.0_20230928-i686-w64-mingw32.zip",
+            "hash": "7a2822ef554be175bbe5c67c2010a6dd29aec6221bdb5ed8970f164e2744714a"
         }
     },
-    "extract_dir": "xtensa-esp32-elf",
+    "extract_dir": "xtensa-esp-elf",
     "bin": [
+        "bin\\xtensa-esp-elf-addr2line.exe",
+        "bin\\xtensa-esp-elf-ar.exe",
+        "bin\\xtensa-esp-elf-as.exe",
+        "bin\\xtensa-esp-elf-c++.exe",
+        "bin\\xtensa-esp-elf-c++filt.exe",
+        "bin\\xtensa-esp-elf-cc.exe",
+        "bin\\xtensa-esp-elf-cpp.exe",
+        "bin\\xtensa-esp-elf-elfedit.exe",
+        "bin\\xtensa-esp-elf-g++.exe",
+        "bin\\xtensa-esp-elf-gcc-ar.exe",
+        "bin\\xtensa-esp-elf-gcc-nm.exe",
+        "bin\\xtensa-esp-elf-gcc-ranlib.exe",
+        "bin\\xtensa-esp-elf-gcc.exe",
+        "bin\\xtensa-esp-elf-gcov-dump.exe",
+        "bin\\xtensa-esp-elf-gcov-tool.exe",
+        "bin\\xtensa-esp-elf-gcov.exe",
+        "bin\\xtensa-esp-elf-gprof.exe",
+        "bin\\xtensa-esp-elf-ld.bfd.exe",
+        "bin\\xtensa-esp-elf-ld.exe",
+        "bin\\xtensa-esp-elf-lto-dump.exe",
+        "bin\\xtensa-esp-elf-nm.exe",
+        "bin\\xtensa-esp-elf-objcopy.exe",
+        "bin\\xtensa-esp-elf-objdump.exe",
+        "bin\\xtensa-esp-elf-ranlib.exe",
+        "bin\\xtensa-esp-elf-readelf.exe",
+        "bin\\xtensa-esp-elf-size.exe",
+        "bin\\xtensa-esp-elf-strings.exe",
+        "bin\\xtensa-esp-elf-strip.exe",
+
         "bin\\xtensa-esp32-elf-addr2line.exe",
         "bin\\xtensa-esp32-elf-ar.exe",
         "bin\\xtensa-esp32-elf-as.exe",
@@ -22,20 +52,19 @@
         "bin\\xtensa-esp32-elf-c++filt.exe",
         "bin\\xtensa-esp32-elf-cc.exe",
         "bin\\xtensa-esp32-elf-cpp.exe",
-        "bin\\xtensa-esp32-elf-ct-ng.config",
         "bin\\xtensa-esp32-elf-elfedit.exe",
         "bin\\xtensa-esp32-elf-g++.exe",
-        "bin\\xtensa-esp32-elf-gcc.exe",
         "bin\\xtensa-esp32-elf-gcc-ar.exe",
         "bin\\xtensa-esp32-elf-gcc-nm.exe",
         "bin\\xtensa-esp32-elf-gcc-ranlib.exe",
-        "bin\\xtensa-esp32-elf-gcov.exe",
+        "bin\\xtensa-esp32-elf-gcc.exe",
         "bin\\xtensa-esp32-elf-gcov-dump.exe",
         "bin\\xtensa-esp32-elf-gcov-tool.exe",
-        "bin\\xtensa-esp32-elf-gdb.exe",
+        "bin\\xtensa-esp32-elf-gcov.exe",
         "bin\\xtensa-esp32-elf-gprof.exe",
         "bin\\xtensa-esp32-elf-ld.bfd.exe",
         "bin\\xtensa-esp32-elf-ld.exe",
+        "bin\\xtensa-esp32-elf-lto-dump.exe",
         "bin\\xtensa-esp32-elf-nm.exe",
         "bin\\xtensa-esp32-elf-objcopy.exe",
         "bin\\xtensa-esp32-elf-objdump.exe",
@@ -43,26 +72,84 @@
         "bin\\xtensa-esp32-elf-readelf.exe",
         "bin\\xtensa-esp32-elf-size.exe",
         "bin\\xtensa-esp32-elf-strings.exe",
-        "bin\\xtensa-esp32-elf-strip.exe"
+        "bin\\xtensa-esp32-elf-strip.exe",
+
+        "bin\\xtensa-esp32s2-elf-addr2line.exe",
+        "bin\\xtensa-esp32s2-elf-ar.exe",
+        "bin\\xtensa-esp32s2-elf-as.exe",
+        "bin\\xtensa-esp32s2-elf-c++.exe",
+        "bin\\xtensa-esp32s2-elf-c++filt.exe",
+        "bin\\xtensa-esp32s2-elf-cc.exe",
+        "bin\\xtensa-esp32s2-elf-cpp.exe",
+        "bin\\xtensa-esp32s2-elf-elfedit.exe",
+        "bin\\xtensa-esp32s2-elf-g++.exe",
+        "bin\\xtensa-esp32s2-elf-gcc-ar.exe",
+        "bin\\xtensa-esp32s2-elf-gcc-nm.exe",
+        "bin\\xtensa-esp32s2-elf-gcc-ranlib.exe",
+        "bin\\xtensa-esp32s2-elf-gcc.exe",
+        "bin\\xtensa-esp32s2-elf-gcov-dump.exe",
+        "bin\\xtensa-esp32s2-elf-gcov-tool.exe",
+        "bin\\xtensa-esp32s2-elf-gcov.exe",
+        "bin\\xtensa-esp32s2-elf-gprof.exe",
+        "bin\\xtensa-esp32s2-elf-ld.bfd.exe",
+        "bin\\xtensa-esp32s2-elf-ld.exe",
+        "bin\\xtensa-esp32s2-elf-lto-dump.exe",
+        "bin\\xtensa-esp32s2-elf-nm.exe",
+        "bin\\xtensa-esp32s2-elf-objcopy.exe",
+        "bin\\xtensa-esp32s2-elf-objdump.exe",
+        "bin\\xtensa-esp32s2-elf-ranlib.exe",
+        "bin\\xtensa-esp32s2-elf-readelf.exe",
+        "bin\\xtensa-esp32s2-elf-size.exe",
+        "bin\\xtensa-esp32s2-elf-strings.exe",
+        "bin\\xtensa-esp32s2-elf-strip.exe",
+
+        "bin\\xtensa-esp32s3-elf-addr2line.exe",
+        "bin\\xtensa-esp32s3-elf-ar.exe",
+        "bin\\xtensa-esp32s3-elf-as.exe",
+        "bin\\xtensa-esp32s3-elf-c++.exe",
+        "bin\\xtensa-esp32s3-elf-c++filt.exe",
+        "bin\\xtensa-esp32s3-elf-cc.exe",
+        "bin\\xtensa-esp32s3-elf-cpp.exe",
+        "bin\\xtensa-esp32s3-elf-elfedit.exe",
+        "bin\\xtensa-esp32s3-elf-g++.exe",
+        "bin\\xtensa-esp32s3-elf-gcc-ar.exe",
+        "bin\\xtensa-esp32s3-elf-gcc-nm.exe",
+        "bin\\xtensa-esp32s3-elf-gcc-ranlib.exe",
+        "bin\\xtensa-esp32s3-elf-gcc.exe",
+        "bin\\xtensa-esp32s3-elf-gcov-dump.exe",
+        "bin\\xtensa-esp32s3-elf-gcov-tool.exe",
+        "bin\\xtensa-esp32s3-elf-gcov.exe",
+        "bin\\xtensa-esp32s3-elf-gprof.exe",
+        "bin\\xtensa-esp32s3-elf-ld.bfd.exe",
+        "bin\\xtensa-esp32s3-elf-ld.exe",
+        "bin\\xtensa-esp32s3-elf-lto-dump.exe",
+        "bin\\xtensa-esp32s3-elf-nm.exe",
+        "bin\\xtensa-esp32s3-elf-objcopy.exe",
+        "bin\\xtensa-esp32s3-elf-objdump.exe",
+        "bin\\xtensa-esp32s3-elf-ranlib.exe",
+        "bin\\xtensa-esp32s3-elf-readelf.exe",
+        "bin\\xtensa-esp32s3-elf-size.exe",
+        "bin\\xtensa-esp32s3-elf-strings.exe",
+        "bin\\xtensa-esp32s3-elf-strip.exe"
     ],
     "checkver": {
         "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-tools.html",
-        "regex": "xtensa-esp32-elf-gcc([\\d_]+-esp-([\\w-]+))-win64.zip"
+        "regex": "xtensa-esp-elf-([\\d.]+_[\\d]+)-x86_64-w64-mingw32.zip"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-$match2/xtensa-esp32-elf-gcc$version-win64.zip",
+                "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-$version/xtensa-esp-elf-$version-x86_64-w64-mingw32.zip",
                 "hash": {
                     "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-tools.html",
-                    "regex": "win64.zip.+\\s.+SHA256: $sha256"
+                    "regex": "xtensa-esp-elf-$version-x86_64-w64-mingw32.zip.+\\s.+SHA256: $sha256"
                 }
             },
             "32bit": {
-                "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-$match2/xtensa-esp32-elf-gcc$version-win32.zip",
+                "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-$version/xtensa-esp-elf-$version-i686-w64-mingw32.zip",
                 "hash": {
                     "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-tools.html",
-                    "regex": "win32.zip.+\\s.+SHA256: $sha256"
+                    "regex": "xtensa-esp-elf-$version-i686-w64-mingw32.zip.+\\s.+SHA256: $sha256"
                 }
             }
         }