diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index 0cf72a4f15..f7ceff278a 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -129,19 +129,6 @@
     - "build:{0}"
     - build:target_test
 
-# For example_test*flash_encryption_wifi_high_traffic jobs
-# set `INCLUDE_NIGHTLY_RUN` variable when triggered on development branches
-"test:example_test-{0}-include_nightly_run-rule":
-  matrix:
-    - - esp32
-      - esp32c3
-  specific_rules:
-    - "if-example_test-ota-include_nightly_run-rule"
-  included_in:
-    - "build:example_test-{0}"
-    - "build:example_test"
-    - build:target_test
-
 "test:host_test":
   labels:
     - host_test
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index e7159bf91c..eb4e53624f 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -181,14 +181,6 @@
   - "components/bt/esp_ble_mesh/lib/lib"
   - ".gitmodules"
 
-# for jobs: flash_encryption_wifi_high_traffic
-.patterns-example_test-ota-nightly_run: &patterns-example_test-ota-nightly_run
-  - "examples/system/ota/**/*"
-  - "examples/common_components/protocol_examples_common/**/*"
-  - "components/app_update/include/*"
-  - "components/app_update/*"
-  - "components/esp_https_ota/**/*"
-
 # for jobs: example_test*ethernet*
 .patterns-example_test-ethernet: &patterns-example_test-ethernet
   - "tools/ci/python_packages/common_test_methods.py"
@@ -264,15 +256,6 @@
 .if-revert-branch: &if-revert-branch
   if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^revert-/'
 
-#####################
-# Specific if rules #
-#####################
-.if-example_test-ota-include_nightly_run-rule: &if-example_test-ota-include_nightly_run-rule
-  <<: *if-dev-push
-  changes: *patterns-example_test-ota-nightly_run
-  variables:
-    INCLUDE_NIGHTLY_RUN: "1"
-
 #########
 # Rules #
 #########
@@ -1471,7 +1454,6 @@
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
-    - <<: *if-example_test-ota-include_nightly_run-rule
     - <<: *if-label-build
     - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32
@@ -1885,15 +1867,6 @@
     - <<: *if-dev-push
       changes: *patterns-example_test-ethernet
 
-.rules:test:example_test-esp32-include_nightly_run-rule:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-example_test-ota-include_nightly_run-rule
-
 .rules:test:example_test-esp32-wifi:
   rules:
     - <<: *if-revert-branch
@@ -1954,15 +1927,6 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
 
-.rules:test:example_test-esp32c3-include_nightly_run-rule:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-example_test-ota-include_nightly_run-rule
-
 .rules:test:example_test-esp32c3-wifi:
   rules:
     - <<: *if-revert-branch
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 11d0b8173e..91ffca345a 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -264,24 +264,6 @@ pytest_examples_esp32_wifi_high_traffic:
       artifacts: false
   tags: [ esp32, wifi_high_traffic ]
 
-pytest_examples_esp32_flash_encryption_wifi_high_traffic:
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32-include_nightly_run-rule
-  needs:
-    - job: build_pytest_examples_esp32
-      artifacts: false
-  tags: [ esp32, flash_encryption_wifi_high_traffic ]
-
-pytest_examples_esp32c3_flash_encryption_wifi_high_traffic:
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32c3-include_nightly_run-rule
-  needs:
-    - job: build_pytest_examples_esp32c3
-      artifacts: false
-  tags: [ esp32c3, flash_encryption_wifi_high_traffic ]
-
 pytest_examples_esp32_ethernet:
   extends:
     - .pytest_examples_dir_template
diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
index 9bc604cda2..c622e50dac 100644
--- a/examples/system/.build-test-rules.yml
+++ b/examples/system/.build-test-rules.yml
@@ -188,6 +188,9 @@ examples/system/ota/simple_ota_example:
     - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6"
       temporary: true
       reason: lack of runners
+  depends_components:
+    - app_update
+    - esp_https_ota
 
 examples/system/perfmon:
   enable: