diff --git a/esp32/Makefile b/esp32/Makefile
index 75b159c92..87ce64d0d 100644
--- a/esp32/Makefile
+++ b/esp32/Makefile
@@ -29,8 +29,8 @@ ESPCOMP = $(ESPIDF)/components
 ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py
 
 # verify the ESP IDF version
-ESPIDF_SUPHASH := 13dfb5568dcc30aa43363c49f7a4505d04036424
-ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show --pretty=format:'%H')
+ESPIDF_SUPHASH := c06cc31d85cc700e1dbddbe527d4282c4bc5845a
+ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
 ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
 $(info ** WARNING **)
 $(info The git hash of ESP IDF does not match the supported version)
diff --git a/esp32/sdkconfig.h b/esp32/sdkconfig.h
index 956eba007..35f9b14e5 100644
--- a/esp32/sdkconfig.h
+++ b/esp32/sdkconfig.h
@@ -16,6 +16,10 @@
 #define CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE 1
 #define CONFIG_ESP32_WIFI_RX_BUFFER_NUM 16
 #define CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE 1
+#define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 10
+#define CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 0
+#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32
+#define CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE 4
 
 #define CONFIG_INT_WDT 1
 #define CONFIG_INT_WDT_TIMEOUT_MS 300
@@ -34,6 +38,7 @@
 #define CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS 1
 #define CONFIG_FREERTOS_ISR_STACKSIZE 1536
 #define CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG 1
+#define CONFIG_FREERTOS_MAX_TASK_NAME_LEN 16
 
 #define CONFIG_MAIN_TASK_STACK_SIZE 4096
 #define CONFIG_BTC_TASK_STACK_SIZE 3072