diff --git a/.github/scripts/install-arduino-ide.sh b/.github/scripts/install-arduino-ide.sh
index 7e268b1f..c714b59e 100755
--- a/.github/scripts/install-arduino-ide.sh
+++ b/.github/scripts/install-arduino-ide.sh
@@ -110,9 +110,10 @@ function build_sketch(){ # build_sketch <fqbn> <path-to-ino> [extra-options]
 		$win_opts $xtra_opts "$sketch"
 }
 
-function count_sketches() # count_sketches <examples-path>
+function count_sketches() # count_sketches <examples-path> <target-mcu>
 {
 	local examples="$1"
+	local target="$2"
     rm -rf sketches.txt
 	if [ ! -d "$examples" ]; then
 		touch sketches.txt
@@ -127,7 +128,7 @@ function count_sketches() # count_sketches <examples-path>
         if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
             continue
         fi;
-        if [[ -f "$sketchdir/.test.skip" ]]; then
+        if [[ -f "$sketchdir/.skip.$target" ]]; then
             continue
         fi
         echo $sketch >> sketches.txt
@@ -136,24 +137,25 @@ function count_sketches() # count_sketches <examples-path>
     return $sketchnum
 }
 
-function build_sketches() # build_sketches <fqbn> <examples-path> <chunk> <total-chunks> [extra-options]
+function build_sketches() # build_sketches <fqbn> <target-mcu> <examples-path> <chunk> <total-chunks> [extra-options]
 {
     local fqbn=$1
-    local examples=$2
-    local chunk_idex=$3
-    local chunks_num=$4
-    local xtra_opts=$5
+	local target="$2"
+    local examples=$3
+    local chunk_idex=$4
+    local chunks_num=$5
+    local xtra_opts=$6
 
-    if [ "$#" -lt 2 ]; then
+    if [ "$#" -lt 3 ]; then
 		echo "ERROR: Illegal number of parameters"
-		echo "USAGE: build_sketches <fqbn> <examples-path> [<chunk> <total-chunks>] [extra-options]"
+		echo "USAGE: build_sketches <fqbn> <target-mcu <examples-path> [<chunk> <total-chunks>] [extra-options]"
 		return 1
 	fi
 
-    if [ "$#" -lt 4 ]; then
+    if [ "$#" -lt 5 ]; then
 		chunk_idex="0"
 		chunks_num="1"
-		xtra_opts=$3
+		xtra_opts=$4
 	fi
 
 	if [ "$chunks_num" -le 0 ]; then
@@ -202,7 +204,7 @@ function build_sketches() # build_sketches <fqbn> <examples-path> <chunk> <total
         local sketchdirname=$(basename $sketchdir)
         local sketchname=$(basename $sketch)
         if [ "${sketchdirname}.ino" != "$sketchname" ] \
-        || [ -f "$sketchdir/.test.skip" ]; then
+        || [ -f "$sketchdir/.skip.$target" ]; then
             continue
         fi
         sketchnum=$(($sketchnum + 1))
diff --git a/.github/scripts/on-push.sh b/.github/scripts/on-push.sh
index a92ac1fc..80b8a383 100755
--- a/.github/scripts/on-push.sh
+++ b/.github/scripts/on-push.sh
@@ -35,6 +35,7 @@ fi
 
 if [ "$BUILD_PIO" -eq 0 ]; then
 	# ArduinoIDE ESP32 Test
+    TARGET="esp32"
 	FQBN="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app"
 	source ./.github/scripts/install-arduino-ide.sh
 	source ./.github/scripts/install-arduino-core-esp32.sh
@@ -53,10 +54,11 @@ if [ "$BUILD_PIO" -eq 0 ]; then
 		if [ "$CHUNK_INDEX" -eq 0 ]; then
 			bash "$ARDUINO_ESP32_PATH/.github/scripts/check-cmakelists.sh"
 		fi
-		build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
+		build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
 	fi
 
 	# ArduinoIDE ESP32S2 Test
+    TARGET="esp32s2"
 	FQBN="espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
 	if [ "$OS_IS_WINDOWS" == "1" ]; then
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
@@ -65,7 +67,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
 	else
-		build_sketches "$FQBN" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
+		build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
     fi
 else
 	source ./.github/scripts/install-platformio-esp32.sh
diff --git a/libraries/BLE/examples/BLE_client/.skip.esp32s2 b/libraries/BLE/examples/BLE_client/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BLE/examples/BLE_iBeacon/.skip.esp32s2 b/libraries/BLE/examples/BLE_iBeacon/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BLE/examples/BLE_notify/.skip.esp32s2 b/libraries/BLE/examples/BLE_notify/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BLE/examples/BLE_scan/.skip.esp32s2 b/libraries/BLE/examples/BLE_scan/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BLE/examples/BLE_server/.skip.esp32s2 b/libraries/BLE/examples/BLE_server/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BLE/examples/BLE_server_multiconnect/.skip.esp32s2 b/libraries/BLE/examples/BLE_server_multiconnect/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BLE/examples/BLE_uart/.skip.esp32s2 b/libraries/BLE/examples/BLE_uart/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BLE/examples/BLE_write/.skip.esp32s2 b/libraries/BLE/examples/BLE_write/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT/.skip.esp32s2 b/libraries/BluetoothSerial/examples/SerialToSerialBT/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino b/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino
index 6d09168d..d779c6d3 100644
--- a/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino
+++ b/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino
@@ -3,7 +3,6 @@
 //
 //This example creates a bridge between Serial and Classical Bluetooth (SPP)
 //and also demonstrate that SerialBT have the same functionalities of a normal Serial
-#if CONFIG_IDF_TARGET_ESP32
 
 #include "BluetoothSerial.h"
 
@@ -28,7 +27,3 @@ void loop() {
   }
   delay(20);
 }
-#else
-void setup() {}
-void loop() {}
-#endif
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBTM/.skip.esp32s2 b/libraries/BluetoothSerial/examples/SerialToSerialBTM/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBTM/SerialToSerialBTM.ino b/libraries/BluetoothSerial/examples/SerialToSerialBTM/SerialToSerialBTM.ino
index c2739e1a..3d17fb90 100644
--- a/libraries/BluetoothSerial/examples/SerialToSerialBTM/SerialToSerialBTM.ino
+++ b/libraries/BluetoothSerial/examples/SerialToSerialBTM/SerialToSerialBTM.ino
@@ -5,7 +5,6 @@
 //it creates a bridge between Serial and Classical Bluetooth (SPP)
 //this is an extention of the SerialToSerialBT example by Evandro Copercini - 2018
 //
-#if CONFIG_IDF_TARGET_ESP32
 
 #include "BluetoothSerial.h"
 
@@ -55,8 +54,3 @@ void loop() {
   }
   delay(20);
 }
-#else
-void setup() {}
-void loop() {}
-#endif
-
diff --git a/libraries/BluetoothSerial/examples/bt_remove_paired_devices/.skip.esp32s2 b/libraries/BluetoothSerial/examples/bt_remove_paired_devices/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/BluetoothSerial/examples/bt_remove_paired_devices/bt_remove_paired_devices.ino b/libraries/BluetoothSerial/examples/bt_remove_paired_devices/bt_remove_paired_devices.ino
index 4be1c1a8..c316a73b 100755
--- a/libraries/BluetoothSerial/examples/bt_remove_paired_devices/bt_remove_paired_devices.ino
+++ b/libraries/BluetoothSerial/examples/bt_remove_paired_devices/bt_remove_paired_devices.ino
@@ -10,7 +10,6 @@
 //The only remedy is to delete this saved bound device from your device flash memory
 //and pair with the other device again.
 //
-#if CONFIG_IDF_TARGET_ESP32
 #include "esp_bt_main.h"
 #include "esp_bt_device.h"
 #include"esp_gap_bt_api.h"
@@ -86,7 +85,3 @@ void setup() {
 }
  
 void loop() {}
-#else
-void setup() {}
-void loop() {}
-#endif
diff --git a/libraries/ESP32/examples/HallSensor/.skip.esp32s2 b/libraries/ESP32/examples/HallSensor/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/ESP32/examples/HallSensor/HallSensor.ino b/libraries/ESP32/examples/HallSensor/HallSensor.ino
index 3db5951d..8045ac91 100644
--- a/libraries/ESP32/examples/HallSensor/HallSensor.ino
+++ b/libraries/ESP32/examples/HallSensor/HallSensor.ino
@@ -1,7 +1,6 @@
 //Simple sketch to access the internal hall effect detector on the esp32.
 //values can be quite low. 
 //Brian Degger / @sctv  
-
 int val = 0;
 void setup() {
   Serial.begin(9600);
diff --git a/libraries/SD_MMC/examples/SDMMC_Test/.skip.esp32s2 b/libraries/SD_MMC/examples/SDMMC_Test/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/SD_MMC/examples/SDMMC_time/.skip.esp32s2 b/libraries/SD_MMC/examples/SDMMC_time/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/SimpleBLE/examples/SimpleBleDevice/.skip.esp32s2 b/libraries/SimpleBLE/examples/SimpleBleDevice/.skip.esp32s2
new file mode 100644
index 00000000..e69de29b