diff --git a/tools/ci/python_packages/ttfw_idf/CIScanTests.py b/tools/ci/python_packages/ttfw_idf/CIScanTests.py
index 08bb1f1d7b..94f2dde197 100644
--- a/tools/ci/python_packages/ttfw_idf/CIScanTests.py
+++ b/tools/ci/python_packages/ttfw_idf/CIScanTests.py
@@ -30,6 +30,8 @@ BUILD_ALL_LABELS = [
     'BOT_LABEL_BUILD_ALL_APPS',
     'BOT_LABEL_REGULAR_TEST',
     'BOT_LABEL_WEEKEND_TEST',
+    'NIGHTLY_RUN',
+    'BOT_LABEL_NIGHTLY_RUN',
 ]
 
 
diff --git a/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py b/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py
index f7b0cbbd34..2a328b3193 100644
--- a/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py
+++ b/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py
@@ -85,7 +85,7 @@ class IDFAssignTest(CIAssignTest.AssignTest):
 
     def search_cases(self, case_filter=None):
         _filter = deepcopy(case_filter) if case_filter else {}
-        if 'NIGHTLY_RUN' in os.environ:
+        if 'NIGHTLY_RUN' in os.environ or 'BOT_LABEL_NIGHTLY_RUN' in os.environ:
             _filter.update({'nightly_run': True})
         return super().search_cases(_filter)