diff --git a/elements/haproxy-octavia/post-install.d/20-haproxy-tune-kernel b/elements/haproxy-octavia/post-install.d/20-haproxy-tune-kernel
index 00f68cc508..cfe0e70215 100755
--- a/elements/haproxy-octavia/post-install.d/20-haproxy-tune-kernel
+++ b/elements/haproxy-octavia/post-install.d/20-haproxy-tune-kernel
@@ -12,8 +12,8 @@ sysctl-write-value net.core.somaxconn 65534
 sysctl-write-value net.ipv4.tcp_synack_retries 3
 sysctl-write-value net.core.netdev_max_backlog 100000
 # This should allow HAProxy maxconn to be 1,000,000
-sysctl-write-value fs.file-max 2097152
-sysctl-write-value fs.nr_open 2097152
+sysctl-write-value fs.file-max 2600000
+sysctl-write-value fs.nr_open 2600000
 
 # It's ok for these to fail if conntrack module isn't loaded
 sysctl-write-value net.netfilter.nf_conntrack_tcp_timeout_time_wait 5 || true
diff --git a/octavia/amphorae/backends/agent/api_server/templates/systemd.conf.j2 b/octavia/amphorae/backends/agent/api_server/templates/systemd.conf.j2
index 9a835cdc41..545486e3a7 100644
--- a/octavia/amphorae/backends/agent/api_server/templates/systemd.conf.j2
+++ b/octavia/amphorae/backends/agent/api_server/templates/systemd.conf.j2
@@ -30,7 +30,7 @@ Type=notify
 
 KillMode=mixed
 Restart=always
-LimitNOFILE=2097152
+LimitNOFILE=2600000
 
 [Install]
 WantedBy=multi-user.target
diff --git a/releasenotes/notes/fix-nr_open-limit-value-7f475c3e301a608d.yaml b/releasenotes/notes/fix-nr_open-limit-value-7f475c3e301a608d.yaml
new file mode 100644
index 0000000000..5976cdc9bb
--- /dev/null
+++ b/releasenotes/notes/fix-nr_open-limit-value-7f475c3e301a608d.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Increase the limit value for nr_open and file-max in the amphora, the new
+    value is based on what HAProxy 2.x is expecting from the system with the
+    greatest maxconn value that Octavia can set.