diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 1befc9996..ab59ac29d 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -42,10 +42,10 @@ jobs:
             additional-sketch-paths: '"libraries/PDM" "libraries/ThreadDebug"'
           - board:
               fqbn: arduino:mbed:envie_m4
-            additional-sketch-paths: '"libraries/doom" "libraries/KernelDebug" "libraries/Portenta_SDCARD" "libraries/Portenta_System" "libraries/Portenta_Video" '
+            additional-sketch-paths: '"libraries/doom" "libraries/KernelDebug" "libraries/Portenta_SDCARD" "libraries/Portenta_Video"'
           - board:
               fqbn: arduino:mbed:envie_m7
-            additional-sketch-paths: '"libraries/doom" "libraries/KernelDebug" "libraries/Portenta_SDCARD" "libraries/Portenta_System" "libraries/Portenta_Video" "libraries/ThreadDebug" "libraries/USBHOST"'
+            additional-sketch-paths: '"libraries/doom" "libraries/KernelDebug" "libraries/Portenta_SDCARD" "libraries/Portenta_System" "libraries/Portenta_Video" "libraries/ThreadDebug" "libraries/USBHOST" "libraries/WiFi"'
 
     steps:
       - name: Checkout repository
diff --git a/libraries/Portenta_System/examples/PortentaH7_updateBootloader/PortentaH7_updateBootloader.ino b/libraries/Portenta_System/examples/PortentaH7_updateBootloader/PortentaH7_updateBootloader.ino
index 8b813129c..d32da8878 100644
--- a/libraries/Portenta_System/examples/PortentaH7_updateBootloader/PortentaH7_updateBootloader.ino
+++ b/libraries/Portenta_System/examples/PortentaH7_updateBootloader/PortentaH7_updateBootloader.ino
@@ -1,6 +1,10 @@
 #include "FlashIAP.h"
 #include "bootloader.h"
 
+#ifndef CORE_CM7  
+  #error Update the bootloader by uploading the sketch to the M7 core instead of the M4 core.
+#endif
+
 #define BOOTLOADER_ADDR   (0x8000000)
 mbed::FlashIAP flash;
 
diff --git a/libraries/WiFi/examples/PortentaWiFiFirmwareUpdater/PortentaWiFiFirmwareUpdater.ino b/libraries/WiFi/examples/PortentaWiFiFirmwareUpdater/PortentaWiFiFirmwareUpdater.ino
index 584a6441e..9af831daf 100644
--- a/libraries/WiFi/examples/PortentaWiFiFirmwareUpdater/PortentaWiFiFirmwareUpdater.ino
+++ b/libraries/WiFi/examples/PortentaWiFiFirmwareUpdater/PortentaWiFiFirmwareUpdater.ino
@@ -4,6 +4,10 @@
 #include "wiced_resource.h"
 #include "certificates.h"
 
+#ifndef CORE_CM7  
+  #error Update the WiFi firmware by uploading the sketch to the M7 core instead of the M4 core.
+#endif
+
 QSPIFBlockDevice root(PD_11, PD_12, PF_7, PD_13,  PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000);
 mbed::MBRBlockDevice wifi_data(&root, 1);
 mbed::FATFileSystem wifi_data_fs("wlan");
@@ -87,4 +91,4 @@ void setup() {
 
 void loop() {
 
-}
\ No newline at end of file
+}