diff --git a/boards/esp32dev.json b/boards/esp32dev.json
new file mode 100644
index 000000000..0ed450c4a
--- /dev/null
+++ b/boards/esp32dev.json
@@ -0,0 +1,34 @@
+{
+    "build": {
+      "core": "esp32",
+      "f_cpu": "240000000L",
+      "f_flash": "40000000L",
+      "flash_mode": "dio",
+      "mcu": "esp32",
+      "variant": "esp32"
+    },
+    "connectivity": [
+      "wifi",
+      "ethernet"
+    ],
+    "debug": {
+      "openocd_board": "esp32.cfg"
+    },
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "Espressif ESP32 Dev Module",
+    "upload": {
+      "flash_size": "16MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 16777216,
+      "require_upload_port": true,
+      "speed": 460800
+    },
+    "download": {
+        "speed": 230400
+    },
+    "url": "https://en.wikipedia.org/wiki/ESP32",
+    "vendor": "Espressif"
+  }
\ No newline at end of file
diff --git a/boards/s3_16M_P.json b/boards/s3_16M_P.json
index 39a795ee5..25949c7b1 100644
--- a/boards/s3_16M_P.json
+++ b/boards/s3_16M_P.json
@@ -24,7 +24,7 @@
       "arduino",
       "espidf"
     ],
-    "name": "Espressif Generic ESP32-S3 16M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS",
+    "name": "Espressif ESP32-S3 16M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS",
     "upload": {
       "flash_size": "16MB",
       "maximum_ram_size": 327680,
diff --git a/boards/s3_32M_P.json b/boards/s3_32M_P.json
index c247db39e..1aa0746c1 100644
--- a/boards/s3_32M_P.json
+++ b/boards/s3_32M_P.json
@@ -21,7 +21,7 @@
       "arduino",
       "espidf"
     ],
-    "name": "Espressif Generic ESP32-S3 32M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS",
+    "name": "Espressif ESP32-S3 32M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS",
     "upload": {
       "flash_size": "32MB",
       "maximum_ram_size": 327680,
diff --git a/boards/s_16M.json b/boards/s_16M.json
index 6362f296d..6dc0a7f65 100644
--- a/boards/s_16M.json
+++ b/boards/s_16M.json
@@ -3,7 +3,7 @@
       "core": "esp32",
       "extra_flags": "-DTASMOTA_SDK",
       "f_cpu": "240000000L",
-      "f_flash": "80000000L",
+      "f_flash": "40000000L",
       "flash_mode": "dio",
       "mcu": "esp32",
       "variant": "esp32"
@@ -19,7 +19,7 @@
       "arduino",
       "espidf"
     ],
-    "name": "Espressif Generic ESP32 16M Flash, Tasmota 4608KB Code/OTA, 2MB FS",
+    "name": "Espressif ESP32 16M Flash, 4608KB Code/OTA, 2MB FS",
     "upload": {
       "flash_size": "16MB",
       "maximum_ram_size": 327680,
diff --git a/boards/s_16M_P.json b/boards/s_16M_P.json
index 3ed91d6e5..462f17bb6 100644
--- a/boards/s_16M_P.json
+++ b/boards/s_16M_P.json
@@ -19,7 +19,7 @@
       "arduino",
       "espidf"
     ],
-    "name": "Espressif Generic ESP32 16M Flash DIO PSRAM, 4608KB Code/OTA, 2MB FS",
+    "name": "Espressif ESP32 16M Flash DIO PSRAM, 4608KB Code/OTA, 2MB FS",
     "upload": {
       "flash_size": "16MB",
       "maximum_ram_size": 327680,
diff --git a/boards/s_4M.json b/boards/s_4M.json
index 13a127242..68ccf38bd 100644
--- a/boards/s_4M.json
+++ b/boards/s_4M.json
@@ -18,7 +18,7 @@
       "arduino",
       "espidf"
     ],
-    "name": "Espressif Generic ESP32 4M Flash, Tasmota 4608KB Code/OTA, 2MB FS",
+    "name": "Tasmota ESP32 4M Flash, 4608KB Code/OTA, 2MB FS",
     "upload": {
       "flash_size": "4MB",
       "maximum_ram_size": 327680,