diff --git a/.gitlab/ci/default-build-test-rules.yml b/.gitlab/ci/default-build-test-rules.yml
index dd8455128d..b10ffeedb0 100644
--- a/.gitlab/ci/default-build-test-rules.yml
+++ b/.gitlab/ci/default-build-test-rules.yml
@@ -7,10 +7,11 @@
 #
 # This file should ONLY be used during bringup. Should be reset to empty after the bringup process
 extra_default_build_targets:
-  - esp32c61
+
 
 bypass_check_test_targets:
   - esp32c5
+  - esp32c61
 
 #
 # These lines would
diff --git a/tools/ci/build_template_app.sh b/tools/ci/build_template_app.sh
index 59457ad0cb..224967aa68 100755
--- a/tools/ci/build_template_app.sh
+++ b/tools/ci/build_template_app.sh
@@ -64,7 +64,7 @@ build_stage2() {
         --size-file size.json \
         --keep-going \
         --collect-size-info size_info.txt \
-        --default-build-targets esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c6 esp32h2 esp32p4 esp32c61
+        --default-build-targets esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c6 esp32h2 esp32p4
 }
 
 build_stage1() {
@@ -78,7 +78,7 @@ build_stage1() {
         --build-log ${BUILD_LOG_CMAKE} \
         --size-file size.json \
         --collect-size-info size_info.txt \
-        --default-build-targets esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c6 esp32h2 esp32p4 esp32c61
+        --default-build-targets esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c6 esp32h2 esp32p4
 }
 
 # Default arguments
diff --git a/tools/ci/dynamic_pipelines/templates/known_generate_test_child_pipeline_warnings.yml b/tools/ci/dynamic_pipelines/templates/known_generate_test_child_pipeline_warnings.yml
index 39eb619fae..09dc5aae94 100644
--- a/tools/ci/dynamic_pipelines/templates/known_generate_test_child_pipeline_warnings.yml
+++ b/tools/ci/dynamic_pipelines/templates/known_generate_test_child_pipeline_warnings.yml
@@ -25,6 +25,7 @@ no_runner_tags:
   - esp32c5_2,generic_multi_device
   - esp32c5_2,wifi_two_dut
   - esp32c6,jtag
+  - esp32c61,generic
   - esp32c61,jtag
   - esp32h2,jtag
   - esp32p4,jtag