diff --git a/README.rst b/README.rst
index c682b23..657ca3e 100644
--- a/README.rst
+++ b/README.rst
@@ -1469,6 +1469,24 @@
           rbac:
             enabled: True
 
+Increase maximum number of allowed address pairs per instance
+-----------------------------------
+
+Neutron Server:
+
+.. code-block:: yaml
+
+    neutron:
+      server:
+        max_allowed_address_pair: 20
+
+Neutron generic node (compute or gateway):
+
+.. code-block:: yaml
+
+    neutron:
+      max_allowed_address_pair: 20
+
 Enhanced logging with logging.conf
 ----------------------------------
 
diff --git a/neutron/files/ocata/neutron-generic.conf b/neutron/files/ocata/neutron-generic.conf
index f1c7bd0..403b3ce 100644
--- a/neutron/files/ocata/neutron-generic.conf
+++ b/neutron/files/ocata/neutron-generic.conf
@@ -300,6 +300,9 @@
 
 # Maximum number of allowed address pairs (integer value)
 #max_allowed_address_pair = 10
+{%- if neutron.max_allowed_address_pair is defined %}
+max_allowed_address_pair = {{ neutron.max_allowed_address_pair }}
+{%- endif %}
 
 #
 # From oslo.log
diff --git a/neutron/files/ocata/neutron-server.conf b/neutron/files/ocata/neutron-server.conf
index 1d8f095..56494f5 100644
--- a/neutron/files/ocata/neutron-server.conf
+++ b/neutron/files/ocata/neutron-server.conf
@@ -347,6 +347,9 @@
 
 # Maximum number of allowed address pairs (integer value)
 #max_allowed_address_pair = 10
+{%- if server.max_allowed_address_pair is defined %}
+max_allowed_address_pair = {{ server.max_allowed_address_pair }}
+{%- endif %}
 
 #
 # From oslo.log
diff --git a/neutron/files/pike/neutron-generic.conf b/neutron/files/pike/neutron-generic.conf
index 7a3f9a8..96d66ba 100644
--- a/neutron/files/pike/neutron-generic.conf
+++ b/neutron/files/pike/neutron-generic.conf
@@ -312,6 +312,9 @@
 
 # Maximum number of allowed address pairs (integer value)
 #max_allowed_address_pair = 10
+{%- if neutron.max_allowed_address_pair is defined %}
+max_allowed_address_pair = {{ neutron.max_allowed_address_pair }}
+{%- endif %}
 
 #
 # From oslo.log
diff --git a/neutron/files/pike/neutron-server.conf b/neutron/files/pike/neutron-server.conf
index 75b6508..4331f42 100644
--- a/neutron/files/pike/neutron-server.conf
+++ b/neutron/files/pike/neutron-server.conf
@@ -383,6 +383,9 @@
 
 # Maximum number of allowed address pairs (integer value)
 #max_allowed_address_pair = 10
+{%- if server.max_allowed_address_pair is defined %}
+max_allowed_address_pair = {{ server.max_allowed_address_pair }}
+{%- endif %}
 
 #
 # From oslo.log
diff --git a/neutron/files/queens/neutron-generic.conf b/neutron/files/queens/neutron-generic.conf
index 2461a31..08b1fff 100644
--- a/neutron/files/queens/neutron-generic.conf
+++ b/neutron/files/queens/neutron-generic.conf
@@ -324,6 +324,9 @@
 
 # Maximum number of allowed address pairs (integer value)
 #max_allowed_address_pair = 10
+{%- if neutron.max_allowed_address_pair is defined %}
+max_allowed_address_pair = {{ neutron.max_allowed_address_pair }}
+{%- endif %}
 
 {%- if neutron.logging is defined %}
 {%- set _data = neutron.logging %}
diff --git a/neutron/files/queens/neutron-server.conf b/neutron/files/queens/neutron-server.conf
index 6145cd0..162d2b6 100644
--- a/neutron/files/queens/neutron-server.conf
+++ b/neutron/files/queens/neutron-server.conf
@@ -368,6 +368,9 @@
 
 # Maximum number of allowed address pairs (integer value)
 #max_allowed_address_pair = 10
+{%- if server.max_allowed_address_pair is defined %}
+max_allowed_address_pair = {{ server.max_allowed_address_pair }}
+{%- endif %}
 
 {%- if server.logging is defined %}
 {%- set _data = server.logging %}