diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29bcce57d1467a0315e147d0bd06a953bca7e4f4..ecd57958c7853558653ffec168c8090a7e70c5e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -210,7 +210,7 @@ publish-seco-intel-b68:
   rules:
     - if: '$CI_SQUAD_TOKEN == null'
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_TYPE == "daily"
 
 ##
 ## Submit jobs to LAVA
@@ -607,7 +607,7 @@ build-npm-cspell:
 
 .oe-selftest-rules:
   rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $OE_SELFTEST == "gcc"
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_TYPE == "weekly"
 
 oe-selftest-gcc-qemu-linux-user:
   extends: [.oe-selftest, .oe-selftest-rules]
diff --git a/.oniro-ci/test-generic.yaml b/.oniro-ci/test-generic.yaml
index 87ae423f01875c7d6e1f5aa6ee67b754085b4414..bd5903b39de37f7f5909a9aa933090001b461326 100644
--- a/.oniro-ci/test-generic.yaml
+++ b/.oniro-ci/test-generic.yaml
@@ -102,7 +102,7 @@
     - if: '$CI_SQUAD_TOKEN == null'
       when: never
     # Run the build when it is scheduled.
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_TYPE == "daily"
     # Do not run pipelines for draft merge requests unless manually triggered.
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^(wip|draft):.*/i'
       when: manual
@@ -138,7 +138,7 @@
     - if: '$CI_SQUAD_TOKEN == null'
       when: never
     # Run the build when it is scheduled.
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_TYPE == "daily"
       when: manual
     # Do not run pipelines for draft merge requests unless manually triggered.
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^(wip|draft):.*/i'
@@ -178,7 +178,7 @@
       - lava-test.svg
   rules:
     # Run the build when it is scheduled.
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_TYPE == "daily"
     # Do not run pipelines for draft merge requests unless manually triggered.
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^(wip|draft):.*/i'
       when: manual