diff --git a/octavia/files/pike/octavia_manager.conf b/octavia/files/pike/octavia_manager.conf
index c21e744..a49fa1a 100644
--- a/octavia/files/pike/octavia_manager.conf
+++ b/octavia/files/pike/octavia_manager.conf
@@ -832,6 +832,7 @@
 
 # Number of amphorae that could be built per controller worker, simultaneously.
 #build_rate_limit=-1
+build_rate_limit = {{ manager.haproxy_amphora.get('build_rate_limit', '-1') }}
 
 # Retry threshold for waiting for a build slot for an amphorae.
 #build_active_retries=300
diff --git a/octavia/files/queens/octavia_manager.conf b/octavia/files/queens/octavia_manager.conf
index 5a9a7d5..4c22e6e 100644
--- a/octavia/files/queens/octavia_manager.conf
+++ b/octavia/files/queens/octavia_manager.conf
@@ -650,6 +650,7 @@
 
 # Number of amphorae that could be built per controller worker, simultaneously.
 #build_rate_limit=-1
+build_rate_limit = {{ manager.haproxy_amphora.get('build_rate_limit', '-1') }}
 
 # Retry threshold for waiting for a build slot for an amphorae.
 #build_active_retries=300
diff --git a/tests/pillar/manager_cluster.sls b/tests/pillar/manager_cluster.sls
index 22db297..40b1c36 100644
--- a/tests/pillar/manager_cluster.sls
+++ b/tests/pillar/manager_cluster.sls
@@ -33,6 +33,7 @@
       amp_ssh_key_name: octavia_ssh_key
       loadbalancer_topology: 'SINGLE'
     haproxy_amphora:
+      build_rate_limit: 2
       client_cert: '/etc/octavia/certs/client.pem'
       client_cert_key: '/etc/octavia/certs/client.key'
       client_cert_all: '/etc/octavia/certs/client_all.pem'
diff --git a/tests/pillar/manager_single.sls b/tests/pillar/manager_single.sls
index a6eab24..fe40b1d 100644
--- a/tests/pillar/manager_single.sls
+++ b/tests/pillar/manager_single.sls
@@ -33,6 +33,7 @@
       amp_ssh_key_name: octavia_ssh_key
       loadbalancer_topology: 'SINGLE'
     haproxy_amphora:
+      build_rate_limit: 2
       client_cert: '/etc/octavia/certs/client.pem'
       client_cert_key: '/etc/octavia/certs/client.key'
       client_cert_all: '/etc/octavia/certs/client_all.pem'