diff --git a/devstack/settings b/devstack/settings
index 11be91e05d..f9ad9e655f 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,10 +1,4 @@
 enable_service ironic ir-api ir-cond
-# Neutron public network type was changed to flat by default recently:
-# https://review.openstack.org/#/c/346282/
-# TODO(vsaienko) remove once ironic-multitenant job variable and ironic
-# developer documentation are updated.
-Q_USE_PROVIDERNET_FOR_PUBLIC=False
-
 # TODO(jroll) this hacks around a bug, remove when fixed in devstack
 # https://bugs.launchpad.net/devstack/+bug/1629133
 SUBNETPOOL_PREFIX_V4=$FIXED_RANGE
diff --git a/doc/source/dev/ironic-multitenant-networking.rst b/doc/source/dev/ironic-multitenant-networking.rst
index 763657e9b1..afbaa8ce86 100644
--- a/doc/source/dev/ironic-multitenant-networking.rst
+++ b/doc/source/dev/ironic-multitenant-networking.rst
@@ -49,6 +49,9 @@ configured in Neutron.
     ENABLE_TENANT_VLANS=True
     Q_ML2_TENANT_NETWORK_TYPE=vlan
     TENANT_VLAN_RANGE=100:150
+    # Neutron public network type was changed to flat by default
+    # in neutron commit 1554adef26bd3bd184ddab668660428bdf392232
+    Q_USE_PROVIDERNET_FOR_PUBLIC=False
 
     # Credentials
     ADMIN_PASSWORD=password