diff --git a/doc/source/cli/command-objects/image-member.rst b/doc/source/cli/command-objects/image-member.rst
new file mode 100644
index 0000000000..4b48991cb3
--- /dev/null
+++ b/doc/source/cli/command-objects/image-member.rst
@@ -0,0 +1,14 @@
+============
+image member
+============
+
+Image v2
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image add project
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image remove project
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image member list
diff --git a/doc/source/cli/command-objects/image-metadef.rst b/doc/source/cli/command-objects/image-metadef.rst
new file mode 100644
index 0000000000..0a41d9261d
--- /dev/null
+++ b/doc/source/cli/command-objects/image-metadef.rst
@@ -0,0 +1,23 @@
+=============
+image metadef
+=============
+
+Image v2
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image metadef namespace create
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image metadef namespace delete
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image metadef namespace list
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image metadef namespace set
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image metadef namespace show
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image metadef resource type list
diff --git a/doc/source/cli/command-objects/image-task.rst b/doc/source/cli/command-objects/image-task.rst
new file mode 100644
index 0000000000..0021192042
--- /dev/null
+++ b/doc/source/cli/command-objects/image-task.rst
@@ -0,0 +1,11 @@
+==========
+image task
+==========
+
+Image v2
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image task list
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image task show
diff --git a/doc/source/cli/command-objects/image-v2.rst b/doc/source/cli/command-objects/image-v2.rst
index 473b26d07b..4a2a4d0f90 100644
--- a/doc/source/cli/command-objects/image-v2.rst
+++ b/doc/source/cli/command-objects/image-v2.rst
@@ -1,6 +1,32 @@
-========
-image v2
-========
+=====
+image
+=====
+
+Image v2
 
 .. autoprogram-cliff:: openstack.image.v2
-   :command: image *
+   :command: image create
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image delete
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image list
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image save
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image set
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image unset
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image show
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image stage
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image import