diff --git a/bucket/xtensa-esp32-elf.json b/bucket/xtensa-esp32-elf.json
index 89d4cb7461..fdfbd021a0 100644
--- a/bucket/xtensa-esp32-elf.json
+++ b/bucket/xtensa-esp32-elf.json
@@ -1,16 +1,16 @@
 {
-    "version": "8_4_0-esp-2021r1",
+    "version": "8_4_0-esp-2021r2",
     "description": "Toolchain for Xtensa (ESP32) 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",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32-elf-gcc8_4_0-esp-2021r1-win64.zip",
-            "hash": "f28f525f6554d72fcd60bdc67b6f095d6c022df6036c3c3166dace37d6ea10b3"
+            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-win64.zip",
+            "hash": "c35b7998f7f503e0cb22055d1e279ae14b6b0e09bb3ff3846b17d552ece9c247"
         },
         "32bit": {
-            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r1/xtensa-esp32-elf-gcc8_4_0-esp-2021r1-win32.zip",
-            "hash": "e4f9fdda192abfc9807e3e7fcd6e9fea30c1a0cf3f3c5a5c961b5114fc8c9b7e"
+            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-win32.zip",
+            "hash": "076a4171bdc33e5ced3952efffb233d70263dfa760e636704050597a9edf61db"
         }
     },
     "extract_dir": "xtensa-esp32-elf",