diff --git a/docs/cli/index.md b/docs/cli/index.md
index b9314b93..c28d4fc7 100644
--- a/docs/cli/index.md
+++ b/docs/cli/index.md
@@ -1,7 +1,7 @@
 # CLI Reference
 
-```{eval-rst}
-.. click:: ss_python.cli:cli
-  :prog: ss-python-cli
-  :nested: full
+```{toctree}
+:maxdepth: 1
+ss_python
+run
 ```
diff --git a/docs/cli/run.md b/docs/cli/run.md
new file mode 100644
index 00000000..e5196a8c
--- /dev/null
+++ b/docs/cli/run.md
@@ -0,0 +1,7 @@
+# Serious Scaffold Python Run
+
+```{eval-rst}
+.. click:: ss_python.cli:run
+  :prog: ss-python-cli run
+  :nested: full
+```
diff --git a/docs/cli/ss_python.md b/docs/cli/ss_python.md
new file mode 100644
index 00000000..e18dcd48
--- /dev/null
+++ b/docs/cli/ss_python.md
@@ -0,0 +1,7 @@
+# Serious Scaffold Python
+
+```{eval-rst}
+.. click:: ss_python.cli:cli
+  :prog: ss-python-cli
+  :nested: short
+```
diff --git a/template/docs/cli/index.md.jinja b/template/docs/cli/index.md.jinja
index 87a2432d..39d3a1a8 100644
--- a/template/docs/cli/index.md.jinja
+++ b/template/docs/cli/index.md.jinja
@@ -1,7 +1,7 @@
 # CLI Reference
 
-```{eval-rst}
-.. click:: {{ module_name }}.cli:cli
-  :prog: {{ package_name }}-cli
-  :nested: full
+```{toctree}
+:maxdepth: 1
+{{ module_name }}
+run
 ```
diff --git a/template/docs/cli/run.md.jinja b/template/docs/cli/run.md.jinja
new file mode 100644
index 00000000..5631cb47
--- /dev/null
+++ b/template/docs/cli/run.md.jinja
@@ -0,0 +1,7 @@
+# {{ project_name }} Run
+
+```{eval-rst}
+.. click:: {{ module_name }}.cli:run
+  :prog: {{ package_name }}-cli run
+  :nested: full
+```
diff --git a/template/docs/cli/{{ module_name }}.md.jinja b/template/docs/cli/{{ module_name }}.md.jinja
new file mode 100644
index 00000000..db73f1e8
--- /dev/null
+++ b/template/docs/cli/{{ module_name }}.md.jinja	
@@ -0,0 +1,7 @@
+# {{ project_name }}
+
+```{eval-rst}
+.. click:: {{ module_name }}.cli:cli
+  :prog: {{ package_name }}-cli
+  :nested: short
+```