diff --git a/stubs/google-cloud-ndb/METADATA.toml b/stubs/google-cloud-ndb/METADATA.toml
index a035bd0a0..acdc22b5d 100644
--- a/stubs/google-cloud-ndb/METADATA.toml
+++ b/stubs/google-cloud-ndb/METADATA.toml
@@ -1,2 +1 @@
-version = "2.0.*"
-requires = []
+version = "2.1.*"
diff --git a/stubs/google-cloud-ndb/google/cloud/ndb/client.pyi b/stubs/google-cloud-ndb/google/cloud/ndb/client.pyi
index 207673ea1..09812a7ff 100644
--- a/stubs/google-cloud-ndb/google/cloud/ndb/client.pyi
+++ b/stubs/google-cloud-ndb/google/cloud/ndb/client.pyi
@@ -1,21 +1,33 @@
-from typing import Any
+from _typeshed import Incomplete
+from collections.abc import Callable, Iterator
+from contextlib import contextmanager
+from typing import ClassVar
 
-DATASTORE_API_HOST: Any
+from google.cloud.ndb import context as context_module, key
+
+DATASTORE_API_HOST: str
 
 class Client:
-    SCOPE: Any
-    namespace: Any
-    host: Any
-    client_info: Any
-    secure: Any
-    stub: Any
-    def __init__(self, project: Any | None = ..., namespace: Any | None = ..., credentials: Any | None = ...) -> None: ...
+    SCOPE: ClassVar[tuple[str, ...]]
+    namespace: str | None
+    host: str
+    client_info: Incomplete
+    secure: bool
+    stub: Incomplete
+    def __init__(
+        self,
+        project: str | None = ...,
+        namespace: str | None = ...,
+        credentials: Incomplete | None = ...,
+        client_options: Incomplete | None = ...,
+    ) -> None: ...
+    @contextmanager
     def context(
         self,
         namespace=...,
-        cache_policy: Any | None = ...,
-        global_cache: Any | None = ...,
-        global_cache_policy: Any | None = ...,
-        global_cache_timeout_policy: Any | None = ...,
+        cache_policy: Callable[[key.Key], bool] | None = ...,
+        global_cache: Incomplete | None = ...,
+        global_cache_policy: Callable[[key.Key], bool] | None = ...,
+        global_cache_timeout_policy: Callable[[key.Key], int] | None = ...,
         legacy_data: bool = ...,
-    ) -> None: ...
+    ) -> Iterator[context_module.Context]: ...