diff --git a/docs/module_metadata.json b/docs/module_metadata.json
index 71429e44f..d4b4f4c66 100644
--- a/docs/module_metadata.json
+++ b/docs/module_metadata.json
@@ -131,6 +131,13 @@
       "C++"
     ]
   },
+  "pw_chre": {
+    "tagline": "Android Context Hub Runtime Environment backend",
+    "status": "experimental",
+    "languages": [
+      "C++"
+    ]
+  },
   "pw_cli": {
     "tagline": "Enhance and accelerate custom command-line tooling",
     "status": "stable",
diff --git a/pw_chre/docs.rst b/pw_chre/docs.rst
index 0fe2af30f..614042d5c 100644
--- a/pw_chre/docs.rst
+++ b/pw_chre/docs.rst
@@ -3,11 +3,8 @@
 =======
 pw_chre
 =======
-
-.. warning::
-
-  This module is extremely experimental. Parts of this module might be broken,
-  and the module does not provide a stable API.
+.. pigweed-module::
+   :name: pw_chre
 
 The `Context Hub Runtime Environment <https://source.android.com/docs/core/interaction/contexthub>`_
 (CHRE) is Android's platform for developing always-on applications called