diff --git a/doc/common/tables/cinder-coraid.xml b/doc/common/tables/cinder-coraid.xml
index 53a7e3428e..4ab6216d89 100644
--- a/doc/common/tables/cinder-coraid.xml
+++ b/doc/common/tables/cinder-coraid.xml
@@ -15,6 +15,10 @@
               </tr>
           </thead>
           <tbody>
+              <tr>
+                       <td>coraid_esm_address=</td>
+                       <td>(StrOpt) IP address of Coraid ESM</td>
+              </tr>
               <tr>
                        <td>coraid_group=admin</td>
                        <td>(StrOpt) Name of group on Coraid ESM to which coraid_user belongs (must have admin privilege)</td>
@@ -33,4 +37,4 @@
               </tr>
        </tbody>
         </table>
-        </para>
\ No newline at end of file
+        </para>
diff --git a/doc/common/tables/cinder-storage.xml b/doc/common/tables/cinder-storage.xml
index 07cbb7a4f3..0f84508caa 100644
--- a/doc/common/tables/cinder-storage.xml
+++ b/doc/common/tables/cinder-storage.xml
@@ -27,10 +27,6 @@
                        <td>capacity_weight_multiplier=1.0</td>
                        <td>(FloatOpt) Multiplier used for weighing volume capacity. Negative numbers mean to stack vs spread.</td>
               </tr>
-              <tr>
-                       <td>coraid_esm_address=</td>
-                       <td>(StrOpt) IP address of Coraid ESM</td>
-              </tr>
               <tr>
                        <td>enabled_backends=None</td>
                        <td>(ListOpt) A list of backend names to use. These backend names should be backed by a unique [CONFIG] group with its options</td>
@@ -153,4 +149,4 @@
               </tr>
        </tbody>
         </table>
-        </para>
\ No newline at end of file
+        </para>
diff --git a/tools/autogenerate-config-docs/flagmappings/cinder.flagmappings b/tools/autogenerate-config-docs/flagmappings/cinder.flagmappings
index 9bf2dffc5e..b2a89edc6c 100644
--- a/tools/autogenerate-config-docs/flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-docs/flagmappings/cinder.flagmappings
@@ -44,7 +44,7 @@ connection_debug connection
 connection_trace connection
 connection_type connection
 control_exchange rpc
-coraid_esm_address storage
+coraid_esm_address coraid
 coraid_group coraid
 coraid_password coraid
 coraid_repository_key coraid