diff --git a/README.rst b/README.rst
index 66ad78f6eb87c..32c8cb212c389 100644
--- a/README.rst
+++ b/README.rst
@@ -218,7 +218,7 @@ Supported         Support status
 ================  ============================================================
 atmel-samd        ``SAMD21`` stable | ``SAMD51`` stable
 cxd56             stable
-espressif         ``ESP32-C3`` beta | ``ESP32-S2`` stable | ``ESP32-S3`` beta
+espressif         ``ESP32`` beta | ``ESP32-C3`` beta | ``ESP32-S2`` stable | ``ESP32-S3`` beta
 litex             alpha
 mimxrt10xx        alpha
 nrf               stable
diff --git a/ports/atmel-samd/.gitignore b/ports/atmel-samd/.gitignore
deleted file mode 100644
index 414487d53eb83..0000000000000
--- a/ports/atmel-samd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*/
diff --git a/ports/cxd56/.gitignore b/ports/cxd56/.gitignore
deleted file mode 100644
index 414487d53eb83..0000000000000
--- a/ports/cxd56/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*/
diff --git a/ports/espressif/.gitignore b/ports/espressif/.gitignore
index 2e3080a40d73d..51c080bb7fd7e 100644
--- a/ports/espressif/.gitignore
+++ b/ports/espressif/.gitignore
@@ -1,2 +1,5 @@
-build*/
-sdkconfig.old
+# idf.py menuconfig
+sdkconfig*
+
+# lock files for examples and components
+dependencies.lock
diff --git a/ports/litex/.gitignore b/ports/litex/.gitignore
deleted file mode 100644
index 414487d53eb83..0000000000000
--- a/ports/litex/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*/
diff --git a/ports/mimxrt10xx/.gitignore b/ports/mimxrt10xx/.gitignore
deleted file mode 100644
index 414487d53eb83..0000000000000
--- a/ports/mimxrt10xx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*/
diff --git a/ports/nrf/.gitignore b/ports/nrf/.gitignore
index cda23c7a9019b..91dce2841a352 100644
--- a/ports/nrf/.gitignore
+++ b/ports/nrf/.gitignore
@@ -1,9 +1,2 @@
-# Old Nordic soft devices that don't allow redistribution
-#########################################################
-drivers/bluetooth/s132_nrf52_2.0.1/
-
+# Softdevice .hex files that should be preserved
 !drivers/bluetooth/*/*.hex
-
-# Build files
-#####################
-build-*/
diff --git a/ports/raspberrypi/.gitignore b/ports/raspberrypi/.gitignore
deleted file mode 100644
index 414487d53eb83..0000000000000
--- a/ports/raspberrypi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*/
diff --git a/ports/stm/.gitignore b/ports/stm/.gitignore
index 5d645392caed5..ade7a0d09dcf5 100644
--- a/ports/stm/.gitignore
+++ b/ports/stm/.gitignore
@@ -1,9 +1,3 @@
-# Build files
-#####################
-build-*/
-
 # Reference files
 #####################
 ref/
-
-.gdb_history
diff --git a/ports/unix/.gitignore b/ports/unix/.gitignore
index 6745218688c20..3ca8f6cb27460 100644
--- a/ports/unix/.gitignore
+++ b/ports/unix/.gitignore
@@ -1,4 +1,3 @@
 micropython
 micropython-*
-*.py
 *.gcov