diff --git a/taskcluster/docs/attributes.rst b/taskcluster/docs/attributes.rst
index 31ddecf3a29b..4b47d90f3a4d 100644
--- a/taskcluster/docs/attributes.rst
+++ b/taskcluster/docs/attributes.rst
@@ -474,3 +474,67 @@ snap_test_type
 For Snap tests tasks, used to disambiguate task label
 
 .. _primary one: https://taskcluster-taskgraph.readthedocs.io/en/latest/reference/transforms/from_deps.html#primary-kind
+
+build-type
+==========
+To do.
+
+component
+=========
+To do.
+
+treeherder-group
+================
+To do.
+
+apks
+====
+To do.
+
+nightly-task
+============
+To do.
+
+release-type
+============
+To do.
+
+shipping-product
+================
+To do.
+
+artifacts
+=========
+To do.
+
+screenshots
+===========
+To do.
+
+legacy
+======
+To do.
+
+is_final_chunked_task
+=====================
+To do.
+
+run_on_tasks_for
+================
+XXX Should not be needed!
+
+primary-kind-dependency
+=======================
+https://taskcluster-taskgraph.readthedocs.io/en/latest/reference/transforms/from_deps.html#primary-kind
+
+nightly-test
+============
+To do.
+
+abi
+===
+To do.
+
+apk
+===
+To do.
diff --git a/taskcluster/docs/kinds.rst b/taskcluster/docs/kinds.rst
index 1b9a18dd193b..1d1541fd2d66 100644
--- a/taskcluster/docs/kinds.rst
+++ b/taskcluster/docs/kinds.rst
@@ -654,6 +654,10 @@ post-beetmover-checksums-dummy
 ------------------------------
 Dummy tasks to consolidate beetmover-checksums dependencies to avoid taskcluster limits on number of dependencies per task.
 
+post-beetmover-components-dummy
+-------------------------------
+Dummy tasks to consolidate beetmover-components dependencies to avoid taskcluster limits on number of dependencies per task.
+
 post-langpack-dummy
 -------------------
 Dummy tasks to consolidate language pack beetmover dependencies to avoid taskcluster limits on number of dependencies per task.
@@ -807,3 +811,67 @@ trigger-comm-central
 --------------------
 Trigger a CI decision task on comm-central when conditions are met. Currently
 used for verifying third party Rust code is consistent.
+
+external-gradle-dependencies
+----------------------------
+External Gradle dependencies toolchain task.
+
+build-components
+----------------
+Build android-components.
+
+build-apk
+---------
+Build Focus, Klar, and Fenix apks.
+
+build-samples-browser
+---------------------
+Build android samples browser.
+
+signing
+-------
+Sign android-components.
+
+signing-apk
+-----------
+Sign Focus, Klar, and Fenix apks.
+
+test-components
+---------------
+Test android-components
+
+test-apk
+--------
+Test Focus, Klar, and Fenix apks.
+
+ui-test-apk
+-----------
+User interface tests for Focus, Klar, and Fenix apks.
+
+android-browsertime
+-------------------
+Browsertime tests for android.
+
+android-startup-test
+--------------------
+Startup test for android.
+
+post-signing
+------------
+Gating kind to wait for all android signing tasks.
+
+beetmover-components
+--------------------
+A beetmover task for android components.
+
+beetmover-android-app
+---------------------
+A beetmover task for android APKs and AABs.
+
+push-bundle
+-----------
+Push Focus and Fenix AABs to Google Play.
+
+version-bump
+------------
+Version bump for mobile/android/version.txt.
diff --git a/taskcluster/docs/transforms/job.rst b/taskcluster/docs/transforms/job.rst
index 160402dd368d..427e6bf03114 100644
--- a/taskcluster/docs/transforms/job.rst
+++ b/taskcluster/docs/transforms/job.rst
@@ -40,3 +40,5 @@ following ``run-using`` are available
   * ``always-optimized``
   * ``fetch-url``
   * ``python-test``
+  * ``gradlew``
+  * ``run-commands``