diff --git a/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst b/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst
index 0f3292489b7..560d1678110 100644
--- a/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst
+++ b/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst
@@ -189,4 +189,7 @@ Driver-specific options
 The following table contains the configuration options that are specific
 to the INFINIDAT driver.
 
-.. include:: ../../tables/cinder-infinidat.inc
+.. config-table::
+   :config-target: INFINIDAT InfiniBox
+
+   cinder.volume.drivers.infinidat
diff --git a/doc/source/configuration/tables/cinder-infinidat.inc b/doc/source/configuration/tables/cinder-infinidat.inc
deleted file mode 100644
index c5529b2818e..00000000000
--- a/doc/source/configuration/tables/cinder-infinidat.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-..
-    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-infinidat:
-
-.. list-table:: Description of INFINIDAT InfiniBox volume driver configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``infinidat_pool_name`` = ``None``
-     - (String) Name of the pool from which volumes are allocated