diff --git a/releasenotes/notes/remove-neutron-dhcp-agents-per-network-1f34e5deeba71cda.yaml b/releasenotes/notes/remove-neutron-dhcp-agents-per-network-1f34e5deeba71cda.yaml
new file mode 100644
index 000000000..4d5e948a0
--- /dev/null
+++ b/releasenotes/notes/remove-neutron-dhcp-agents-per-network-1f34e5deeba71cda.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Removed setting NeutronDhcpAgentsPerNetwork based on controller count.
+    If not overridden by the user, it should be calculated based on the
+    number of neutron DHCP agents that are actually deployed.
diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
index fd8c1ba82..9d8f46e32 100644
--- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
+++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
@@ -137,7 +137,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
             'ExtraConfig': '{}',
             'HypervisorNeutronPhysicalBridge': 'br-ex',
             'HypervisorNeutronPublicInterface': 'nic1',
-            'NeutronDhcpAgentsPerNetwork': 1,
             'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
             'NeutronFlatNetworks': 'datacentre',
             'NeutronPublicInterface': 'nic1',
@@ -261,7 +260,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
             'ExtraConfig': '{}',
             'HypervisorNeutronPhysicalBridge': 'br-ex',
             'HypervisorNeutronPublicInterface': 'nic1',
-            'NeutronDhcpAgentsPerNetwork': 1,
             'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
             'NeutronFlatNetworks': 'datacentre',
             'NeutronNetworkType': 'gre',
@@ -1192,7 +1190,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
             'ExtraConfig': '{}',
             'HypervisorNeutronPhysicalBridge': 'br-ex',
             'HypervisorNeutronPublicInterface': 'nic1',
-            'NeutronDhcpAgentsPerNetwork': 3,
             'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
             'NeutronFlatNetworks': 'datacentre',
             'NeutronNetworkType': 'gre',
diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py
index 516f46fa2..0f7589d6e 100644
--- a/tripleoclient/v1/overcloud_deploy.py
+++ b/tripleoclient/v1/overcloud_deploy.py
@@ -105,15 +105,6 @@ class DeployOvercloud(command.Command):
             if getattr(args, arg, None) is not None:
                 parameters[param] = getattr(args, arg)
 
-        # Scaling needs extra parameters
-        number_controllers = int(parameters.get('ControllerCount', 0))
-        dhcp_agents_per_network = (min(number_controllers, 3) if
-                                   number_controllers else 1)
-
-        parameters.update({
-            'NeutronDhcpAgentsPerNetwork': dhcp_agents_per_network,
-        })
-
         return parameters
 
     def _create_registration_env(self, args):