diff --git a/doc/source/cli/command-objects/command.rst b/doc/source/cli/command-objects/command.rst
index 918fd959ad..5afc4940ab 100644
--- a/doc/source/cli/command-objects/command.rst
+++ b/doc/source/cli/command-objects/command.rst
@@ -6,18 +6,5 @@ Internal
 
 Installed commands in the OSC process.
 
-command list
-------------
-
-List recognized commands by group
-
-.. program:: command list
-.. code:: bash
-
-    openstack command list
-        [--group <group-keyword>]
-
-.. option:: --group <group-keyword>
-
-    Show commands filtered by a command group, for example: identity, volume,
-    compute, image, network and other keywords
+.. autoprogram-cliff:: openstack.cli
+   :command: command *
diff --git a/doc/source/cli/command-objects/module.rst b/doc/source/cli/command-objects/module.rst
index f4b32e7589..82269f472d 100644
--- a/doc/source/cli/command-objects/module.rst
+++ b/doc/source/cli/command-objects/module.rst
@@ -6,17 +6,5 @@ Internal
 
 Installed Python modules in the OSC process.
 
-module list
------------
-
-List module versions
-
-.. program:: module list
-.. code:: bash
-
-    openstack module list
-        [--all]
-
-.. option:: --all
-
-    Show all modules that have version information
+.. autoprogram-cliff:: openstack.cli
+   :command: module *