diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp
index dcfab7b..6a717a2 100644
--- a/deployment_scripts/puppet/manifests/controller.pp
+++ b/deployment_scripts/puppet/manifests/controller.pp
@@ -18,8 +18,5 @@ if ($mlnx['sriov']) {
 }
 # Configure broadcast dnsmasq for IB PV
 elsif ($mlnx['driver'] == 'eth_ipoib') {
-  class { 'mellanox_openstack::controller_ib_pv' :
-    mlnx_driver                 => $mlnx['driver'],
-    mlnx_sriov                  => $mlnx['sriov'],
-  }
+  class { 'mellanox_openstack::controller_ib_pv' : }
 }
diff --git a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_ib_pv.pp b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_ib_pv.pp
index 4ba3f64..2fb5ac2 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_ib_pv.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_ib_pv.pp
@@ -1,34 +1,16 @@
-class mellanox_openstack::controller_ib_pv (
-  $mlnx_driver,
-  $mlnx_sriov
-){
+class mellanox_openstack::controller_ib_pv (){
 
   include neutron::params
   $dhcp_agent = $neutron::params::dhcp_agent_service
-  $mlnx_dnsmasq_pv_config_file = '/etc/mlnx_dnsmasq_pv.conf'
-
-  if ( $mlnx_driver == 'eth_ipoib' and $mlnx_sriov != true ){
-
-    file { $mlnx_dnsmasq_pv_config_file :
-      ensure    => file,
-      owner     => 'neutron',
-      group     => 'neutron',
-      mode      => '644',
-      content   => template('mellanox_openstack/mlnx_dnsmasq_pv_config.erb'),
-    } ~>
-
-    neutron_dhcp_agent_config { 'DEFAULT/dnsmasq_config_file' :
-      value     => $mlnx_dnsmasq_pv_config_file,
-    }
-
-    service { $dhcp_agent :
-      ensure    =>  running,
-      enable    =>  true,
-      provider  =>  pacemaker,
-      subscribe =>  [File[$mlnx_dnsmasq_pv_config_file],
-                     Neutron_dhcp_agent_config['DEFAULT/dnsmasq_config_file']]
-    }
 
+  neutron_dhcp_agent_config { 'DEFAULT/dhcp_broadcast_reply' :
+    value     => 'True',
   }
 
+  service { $dhcp_agent :
+    ensure     =>  running,
+    enable     =>  true,
+    provider   =>  pacemaker,
+    subscribe  =>  [Neutron_dhcp_agent_config['DEFAULT/dhcp_broadcast_reply']],
+  }
 }
diff --git a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_sriov.pp b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_sriov.pp
index 3856e03..1a7d292 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_sriov.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_sriov.pp
@@ -48,17 +48,21 @@ class mellanox_openstack::controller_sriov (
   Neutron_plugin_ml2 <||> ~>
   Service[$server_service]
 
-  if ( $mlnx_driver == 'eth_ipoib' and $mlnx_sriov == true ){
-
+  if ( $mlnx_driver == 'eth_ipoib' ){
     neutron_dhcp_agent_config { 'DEFAULT/dhcp_driver' :
       value     => 'networking_mlnx.dhcp.mlnx_dhcp.MlnxDnsmasq',
     }
 
+    neutron_dhcp_agent_config { 'DEFAULT/dhcp_broadcast_reply' :
+      value     => 'True',
+    }
+
     service { $dhcp_agent :
       ensure     =>  running,
       enable     =>  true,
       provider   =>  pacemaker,
-      subscribe  =>  Neutron_dhcp_agent_config['DEFAULT/dhcp_driver'],
+      subscribe  =>  [Neutron_dhcp_agent_config['DEFAULT/dhcp_driver'],
+                      Neutron_dhcp_agent_config['DEFAULT/dhcp_broadcast_reply']],
     }
   }
 }
diff --git a/metadata.yaml b/metadata.yaml
index 13a6c80..5a48c81 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ name: mellanox-plugin
 title: Mellanox Openstack features
 
 # Plugin version
-version: 2.0.24
+version: 2.0.25
 
 # Description
 description: Enable features over Mellanox hardware