diff --git a/Makefile b/Makefile
index 1be71fb0..a08433e9 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,11 @@ else ifeq ($(HW),ESP32)
 	TARGET_SDK_LIBS=rtc c m driver
 	TARGET_LDFLAGS=
 	LD_FILE=$(LDDIR)/nodemcu32.ld
-	AR = xtensa-esp108-elf-ar
-	CC = xtensa-esp108-elf-gcc
-	NM = xtensa-esp108-elf-nm
-	CPP = xtensa-esp108-elf-cpp
-	OBJCOPY = xtensa-esp108-elf-objcopy
+	AR = xtensa-esp32-elf-ar
+	CC = xtensa-esp32-elf-gcc
+	NM = xtensa-esp32-elf-nm
+	CPP = xtensa-esp32-elf-cpp
+	OBJCOPY = xtensa-esp32-elf-objcopy
 else
   $(error Unsupported hardware platform: $(HW))
 endif
diff --git a/tools/toolchains b/tools/toolchains
index c43f68cf..2cb45e9e 160000
--- a/tools/toolchains
+++ b/tools/toolchains
@@ -1 +1 @@
-Subproject commit c43f68cf04b7881d755feb5377613d93c0d5766b
+Subproject commit 2cb45e9ea7c18d78d4c312b2a7d6e0719e743593