diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/GENERIC_S2/board.json
index 4ecb90a48..5e1758b86 100644
--- a/ports/esp32/boards/GENERIC_S2/board.json
+++ b/ports/esp32/boards/GENERIC_S2/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
     "features": [],
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/board.json b/ports/esp32/boards/LOLIN_S2_MINI/board.json
index 5e866f0e5..a84a3098b 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/board.json
+++ b/ports/esp32/boards/LOLIN_S2_MINI/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
     "features": [],
diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
index bbfd38900..d2da16a6e 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -1,10 +1,9 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
     "features": [
-        "BLE",
         "WiFi",
         "Feather",
         "Battery Charging",
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
index 1bcc2a4b2..1e3e2c0e3 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -1,10 +1,9 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
     "features": [
-        "BLE",
         "WiFi",
         "Feather",
         "Battery Charging",
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
index bc694c2cc..d378f6b9d 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -1,9 +1,12 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "WiFi",
+        "USB-C"
+    ],
     "id": "tinys2",
     "images": [
         "TinyS2+Product+Shot.jpg"
diff --git a/ports/esp32/boards/deploy.md b/ports/esp32/boards/deploy.md
index c8740a8dd..64e683edf 100644
--- a/ports/esp32/boards/deploy.md
+++ b/ports/esp32/boards/deploy.md
@@ -1,4 +1,5 @@
 Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+
 If you are putting MicroPython on your board for the first time then you should
 first erase the entire flash using:
 
diff --git a/ports/esp32/boards/deploy_s2.md b/ports/esp32/boards/deploy_s2.md
new file mode 100644
index 000000000..5b3057087
--- /dev/null
+++ b/ports/esp32/boards/deploy_s2.md
@@ -0,0 +1,14 @@
+Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+```bash
+esptool.py --chip esp32s2 --port /dev/ttyACM0 erase_flash
+```
+
+From then on program the firmware starting at address 0x1000:
+
+```bash
+esptool.py --chip esp32s2 --port /dev/ttyACM0 write_flash -z 0x1000 board-20210902-v1.17.bin
+```