diff --git a/README-LVGL.md b/README-LVGL.md
index f6f55b2ed..6f2a3fc60 100644
--- a/README-LVGL.md
+++ b/README-LVGL.md
@@ -109,7 +109,7 @@ Here is the command to build ESP32 + LVGL which is compatible with ILI9341 drive
 
 ```
 make -C mpy-cross
-make -C ports/esp32 LV_CFLAGS="-DLV_COLOR_DEPTH=16" BOARD=ESP32_GENERIC VARIANT=SPIRAM deploy
+make -C ports/esp32 LV_CFLAGS="-DLV_COLOR_DEPTH=16" BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM deploy
 ```
 
 Explanation about the parameters:
diff --git a/ports/esp32/boards/M5STACK_CORE2/board.json b/ports/esp32/boards/M5STACK_CORE2/board.json
index 5f4de6712..ebcaaca38 100644
--- a/ports/esp32/boards/M5STACK_CORE2/board.json
+++ b/ports/esp32/boards/M5STACK_CORE2/board.json
@@ -6,6 +6,7 @@
     "features": [
         "BLE",
         "WiFi",
+        "Dual-core",
         "External Flash",
         "External RAM",
         "SDCard",
diff --git a/ports/esp32/boards/M5STACK_CORE2/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_CORE2/mpconfigboard.cmake
index 045977a59..c18fd61fd 100644
--- a/ports/esp32/boards/M5STACK_CORE2/mpconfigboard.cmake
+++ b/ports/esp32/boards/M5STACK_CORE2/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram
diff --git a/scripts/build-esp32.sh b/scripts/build-esp32.sh
index fdbb06c9d..f4f962586 100755
--- a/scripts/build-esp32.sh
+++ b/scripts/build-esp32.sh
@@ -14,4 +14,4 @@ cd $MICROPYTHON
 make -C mpy-cross
 
 cd $MICROPYTHON/ports/esp32
-make BOARD=$BOARD VARIANT=$VARIANT
+make BOARD=$BOARD BOARD_VARIANT=$BOARD_VARIANT
diff --git a/scripts/deploy-esp32.sh b/scripts/deploy-esp32.sh
index 28d99efc1..78833585b 100755
--- a/scripts/deploy-esp32.sh
+++ b/scripts/deploy-esp32.sh
@@ -11,4 +11,4 @@ if [ -z "$BOARD" ]; then
 fi
 
 cd $MICROPYTHON/ports/esp32
-make deploy BOARD=$BOARD VARIANT=$VARIANT
+make deploy BOARD=$BOARD BOARD_VARIANT=$VARIANT
diff --git a/scripts/menu-esp32.sh b/scripts/menu-esp32.sh
index e88c32aa1..33da91665 100644
--- a/scripts/menu-esp32.sh
+++ b/scripts/menu-esp32.sh
@@ -31,9 +31,9 @@ if [[ $choice -lt 1 || $choice -gt ${#configs[@]} ]]; then
     exit 1
 fi
 
-# Set BOARD and VARIANT based on user choice
+# Set BOARD and BOARD_VARIANT based on user choice
 selected_config=(${configs[$((choice-1))]})
 BOARD=${selected_config[0]}
-VARIANT=${selected_config[1]:-""}
+BOARD_VARIANT=${selected_config[1]:-""}
 
-echo "Selected configuration: BOARD=$BOARD, VARIANT=$VARIANT"
+echo "Selected configuration: BOARD=$BOARD, BOARD_VARIANT=$BOARD_VARIANT"