diff --git a/doc/config-reference/source/block-storage/drivers/emc-xtremio-driver.rst b/doc/config-reference/source/block-storage/drivers/emc-xtremio-driver.rst
index 793336834e..076d32f2de 100644
--- a/doc/config-reference/source/block-storage/drivers/emc-xtremio-driver.rst
+++ b/doc/config-reference/source/block-storage/drivers/emc-xtremio-driver.rst
@@ -49,6 +49,8 @@ under a separate section in case of multiple back ends (for example
 [XTREMIO]). The configuration file is usually located under the
 following path ``/etc/cinder/cinder.conf``.
 
+.. include:: ../../tables/cinder-emc_xtremio.rst
+
 For a configuration example, refer to the configuration
 :ref:`emc_extremio_configuration_example`.
 
diff --git a/doc/config-reference/source/tables/cinder-emc.rst b/doc/config-reference/source/tables/cinder-emc.rst
index 63e43166ac..c8cf94418a 100644
--- a/doc/config-reference/source/tables/cinder-emc.rst
+++ b/doc/config-reference/source/tables/cinder-emc.rst
@@ -44,11 +44,3 @@
      - (String) Comma-separated list of storage pool names to be used.
    * - ``storage_vnx_security_file_dir`` = ``None``
      - (String) Directory path that contains the VNX security file. Make sure the security file is generated first.
-   * - ``xtremio_array_busy_retry_count`` = ``5``
-     - (Integer) Number of retries in case array is busy
-   * - ``xtremio_array_busy_retry_interval`` = ``5``
-     - (Integer) Interval between retries in case array is busy
-   * - ``xtremio_cluster_name`` =
-     - (String) XMS cluster id in multi-cluster environment
-   * - ``xtremio_volumes_per_glance_cache`` = ``100``
-     - (Integer) Number of volumes created from each cached glance image
diff --git a/doc/config-reference/source/tables/cinder-emc_xtremio.rst b/doc/config-reference/source/tables/cinder-emc_xtremio.rst
new file mode 100644
index 0000000000..651a97160d
--- /dev/null
+++ b/doc/config-reference/source/tables/cinder-emc_xtremio.rst
@@ -0,0 +1,28 @@
+..
+    Warning: Do not edit this file. It is automatically generated from the
+    software project's code and your changes will be overwritten.
+
+    The tool to generate this file lives in openstack-doc-tools repository.
+
+    Please make any changes needed in the code, then run the
+    autogenerate-config-doc tool from the openstack-doc-tools repository, or
+    ask for help on the documentation mailing list, IRC channel or meeting.
+
+.. _cinder-emc_xtremio:
+
+.. list-table:: Description of EMC XtremIO volume driver configuration options
+   :header-rows: 1
+   :class: config-ref-table
+
+   * - Configuration option = Default value
+     - Description
+   * - **[DEFAULT]**
+     -
+   * - ``xtremio_array_busy_retry_count`` = ``5``
+     - (Integer) Number of retries in case array is busy
+   * - ``xtremio_array_busy_retry_interval`` = ``5``
+     - (Integer) Interval between retries in case array is busy
+   * - ``xtremio_cluster_name`` =
+     - (String) XMS cluster id in multi-cluster environment
+   * - ``xtremio_volumes_per_glance_cache`` = ``100``
+     - (Integer) Number of volumes created from each cached glance image
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index 70ab68e1cc..fe95a359f8 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -636,10 +636,10 @@ windows_iscsi_lun_path windows
 xiv_chap xiv
 xiv_ds8k_connection_type xiv
 xiv_ds8k_proxy xiv
-xtremio_array_busy_retry_count emc
-xtremio_array_busy_retry_interval emc
-xtremio_cluster_name emc
-xtremio_volumes_per_glance_cache emc
+xtremio_array_busy_retry_count emc_xtremio
+xtremio_array_busy_retry_interval emc_xtremio
+xtremio_cluster_name emc_xtremio
+xtremio_volumes_per_glance_cache emc_xtremio
 zfssa_cache_directory zfssa-nfs
 zfssa_cache_project zfssa-nfs
 zfssa_data_ip zfssa-nfs
diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers
index 60dc9550b3..48166bf6e5 100644
--- a/tools/autogenerate-config-flagmappings/cinder.headers
+++ b/tools/autogenerate-config-flagmappings/cinder.headers
@@ -16,6 +16,7 @@ dothill Dot Hill volume driver
 drbd DRBD
 emc EMC
 emc_sio EMC SIO volume driver
+emc_xtremio EMC XtremIO volume driver
 eqlx Dell EqualLogic volume driver
 eternus Eternus volume driver
 flashsystem IBM FlashSystem volume driver