diff --git a/src/api-service/__app__/onefuzzlib/pools.py b/src/api-service/__app__/onefuzzlib/pools.py
index 3fb6cfb0b..1c001a08e 100644
--- a/src/api-service/__app__/onefuzzlib/pools.py
+++ b/src/api-service/__app__/onefuzzlib/pools.py
@@ -100,6 +100,7 @@ class Node(BASE_NODE, ORMMixin):
         states: Optional[List[NodeState]] = None,
         pool_name: Optional[str] = None,
         exclude_update_scheduled: bool = False,
+        num_results: Optional[int] = None,
     ) -> List["Node"]:
         query: QueryFilter = {}
         if scaleset_id:
@@ -117,11 +118,14 @@ class Node(BASE_NODE, ORMMixin):
         # We write the query this way to allow us to get the nodes where the
         # version is not defined as well as the nodes with a mismatched version
         version_query = "not (version eq '%s')" % __version__
-        return cls.search(query=query, raw_unchecked_filter=version_query)
+        return cls.search(
+            query=query, raw_unchecked_filter=version_query, num_results=num_results
+        )
 
     @classmethod
     def mark_outdated_nodes(cls) -> None:
-        outdated = cls.search_outdated(exclude_update_scheduled=True)
+        # ony update 500 nodes at a time to mitigate timeout issues
+        outdated = cls.search_outdated(exclude_update_scheduled=True, num_results=500)
         for node in outdated:
             logging.info(
                 "node is outdated: %s - node_version:%s api_version:%s",