diff --git a/doc/source/command-objects/server-image.rst b/doc/source/command-objects/server-image.rst
index 681f6e4f2c..4577b25b20 100644
--- a/doc/source/command-objects/server-image.rst
+++ b/doc/source/command-objects/server-image.rst
@@ -10,6 +10,7 @@ server image create
 
 Create a new disk image from a running server
 
+.. program:: server image create
 .. code:: bash
 
     os server image create
@@ -17,11 +18,14 @@ Create a new disk image from a running server
         [--wait]
         <server>
 
-:option:`--name` <image-name>
+.. option:: --name <image-name>
+
     Name of new image (default is server name)
 
-:option:`--wait`
+.. option:: --wait
+
     Wait for image create to complete
 
-:option:`<server>`
+.. describe:: <server>
+
     Server (name or ID)