diff --git a/doc/config-reference/source/tables/neutron-common.rst b/doc/config-reference/source/tables/neutron-common.rst
index d83d6e7341..32b284005a 100644
--- a/doc/config-reference/source/tables/neutron-common.rst
+++ b/doc/config-reference/source/tables/neutron-common.rst
@@ -20,6 +20,10 @@
      -
    * - ``agent_down_time`` = ``75``
      - (Integer) Seconds to regard the agent is down; should be at least twice report_interval, to be sure the agent is down for good.
+   * - ``allow_automatic_dhcp_failover`` = ``True``
+     - (Boolean) Automatically remove networks from offline DHCP agents.
+   * - ``allow_automatic_l3agent_failover`` = ``False``
+     - (Boolean) Automatically reschedule routers from offline L3 agents to online L3 agents.
    * - ``api_workers`` = ``None``
      - (Integer) Number of separate API worker processes for service. If not specified, the default is equal to the number of CPUs available for best performance.
    * - ``auth_ca_cert`` = ``None``
diff --git a/doc/config-reference/source/tables/neutron-l3_agent.rst b/doc/config-reference/source/tables/neutron-l3_agent.rst
index 38b313f06a..487ed7b7ee 100644
--- a/doc/config-reference/source/tables/neutron-l3_agent.rst
+++ b/doc/config-reference/source/tables/neutron-l3_agent.rst
@@ -20,10 +20,6 @@
      -
    * - ``agent_mode`` = ``legacy``
      - (String) The working mode for the agent. Allowed modes are: 'legacy' - this preserves the existing behavior where the L3 agent is deployed on a centralized networking node to provide L3 services like DNAT, and SNAT. Use this mode if you do not want to adopt DVR. 'dvr' - this mode enables DVR functionality and must be used for an L3 agent that runs on a compute host. 'dvr_snat' - this enables centralized SNAT support in conjunction with DVR. This mode must be used for an L3 agent running on a centralized node (or in single-host deployments, e.g. devstack)
-   * - ``allow_automatic_dhcp_failover`` = ``True``
-     - (Boolean) Automatically remove networks from offline DHCP agents.
-   * - ``allow_automatic_l3agent_failover`` = ``False``
-     - (Boolean) Automatically reschedule routers from offline L3 agents to online L3 agents.
    * - ``enable_metadata_proxy`` = ``True``
      - (Boolean) Allow running metadata proxy.
    * - ``enable_snat_by_default`` = ``True``
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index 4b0605f956..8a79ce9df3 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -1,8 +1,8 @@
 advertise_mtu dhcp_agent
 agent_down_time common
 agent_mode l3_agent
-allow_automatic_dhcp_failover l3_agent
-allow_automatic_l3agent_failover l3_agent
+allow_automatic_dhcp_failover common
+allow_automatic_l3agent_failover common
 allow_bulk api
 allow_overlapping_ips policy
 allow_pagination api