diff --git a/Kconfig b/Kconfig
index ea0cada998..a71e3179a2 100644
--- a/Kconfig
+++ b/Kconfig
@@ -119,7 +119,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
         default "y" if IDF_TARGET="esp32c5"
         select FREERTOS_UNICORE
         select IDF_TARGET_ARCH_RISCV
-	    select IDF_ENV_FPGA
+        select IDF_ENV_BRINGUP
 
     config IDF_TARGET_ESP32P4
         bool
diff --git a/components/bootloader_support/src/bootloader_random_esp32c5.c b/components/bootloader_support/src/bootloader_random_esp32c5.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
index 9811ec8e62..485c742537 100644
--- a/examples/system/.build-test-rules.yml
+++ b/examples/system/.build-test-rules.yml
@@ -54,8 +54,8 @@ examples/system/deep_sleep_wake_stub:
       reason: target(s) is not supported yet
 
 examples/system/efuse:
-  enable:
-    - if: IDF_TARGET == "esp32" or (NIGHTLY_RUN == "1" and IDF_TARGET != "linux")
+  disable:
+    - if: IDF_TARGET != "esp32" and (NIGHTLY_RUN != "1" or IDF_TARGET == "linux")
       reason: no target specific functionality, testing on a single target is sufficient
   depends_components:
     - efuse
@@ -74,11 +74,9 @@ examples/system/esp_timer:
     - esp_timer
 
 examples/system/eventfd:
-  enable:
-    - if: IDF_TARGET == "esp32" or (NIGHTLY_RUN == "1" and IDF_TARGET != "linux")
-      reason: no target specific functionality, testing on a single target is sufficient
   disable:
-    - if: SOC_GPTIMER_SUPPORTED != 1
+    - if: SOC_GPTIMER_SUPPORTED != 1 and (IDF_TARGET != "esp32" and (NIGHTLY_RUN != "1" or IDF_TARGET == "linux"))
+      reason: no target specific functionality, testing on a single target is sufficient
   depends_components:
     - vfs
     - esp_driver_gptimer
@@ -90,8 +88,8 @@ examples/system/flash_suspend:
       reason: the other targets are not tested yet
 
 examples/system/freertos:
-  enable:
-    - if: IDF_TARGET == "esp32" or (NIGHTLY_RUN == "1" and IDF_TARGET != "linux")
+  disable:
+    - if: IDF_TARGET != "esp32" and (NIGHTLY_RUN != "1" or IDF_TARGET == "linux")
       reason: no target specific functionality, testing on a single target is sufficient
   depends_components:
     - freertos
@@ -109,8 +107,8 @@ examples/system/gdbstub:
       reason: not supported yet #TODO: IDF-7510
 
 examples/system/heap_task_tracking:
-  enable:
-    - if: IDF_TARGET == "esp32c3" or (NIGHTLY_RUN == "1" and IDF_TARGET != "linux")
+  disable:
+    - if: IDF_TARGET != "esp32c3" and (NIGHTLY_RUN != "1" or IDF_TARGET == "linux")
       reason: no target specific functionality, testing on a single target is sufficient
   depends_components:
     - heap
@@ -201,15 +199,15 @@ examples/system/perfmon:
     - perfmon
 
 examples/system/pthread:
-  enable:
-    - if: IDF_TARGET == "esp32" or (NIGHTLY_RUN == "1" and IDF_TARGET != "linux")
+  disable:
+    - if: IDF_TARGET != "esp32" and (NIGHTLY_RUN != "1" or IDF_TARGET == "linux")
       reason: no target specific functionality, testing on a single target is sufficient
   depends_components:
     - pthread
 
 examples/system/select:
-  enable:
-    - if: IDF_TARGET == "esp32c3" or (NIGHTLY_RUN == "1" and IDF_TARGET != "linux")
+  disable:
+    - if: IDF_TARGET != "esp32c3" and (NIGHTLY_RUN != "1" or IDF_TARGET == "linux")
       reason: no target specific functionality, testing on a single target is sufficient
   depends_components:
     - vfs
@@ -237,8 +235,8 @@ examples/system/sysview_tracing_heap_log:
       reason: lack of runners
 
 examples/system/task_watchdog:
-  enable:
-    - if: IDF_TARGET == "esp32" or (NIGHTLY_RUN == "1" and IDF_TARGET != "linux")
+  disable:
+    - if: IDF_TARGET != "esp32" and (NIGHTLY_RUN != "1" or IDF_TARGET == "linux")
       reason: no target specific functionality, testing on a single target is sufficient
   depends_components:
     - esp_system
@@ -326,8 +324,8 @@ examples/system/ulp/ulp_riscv/uart_print:
     - ulp
 
 examples/system/unit_test/:
-  enable:
-    - if: IDF_TARGET == "esp32" or (NIGHTLY_RUN == "1" and IDF_TARGET != "linux")
+  disable:
+    - if: IDF_TARGET != "esp32" and (NIGHTLY_RUN != "1" or IDF_TARGET == "linux")
       reason: no target specific functionality, testing on a single target is sufficient
   depends_components:
     - unity