diff --git a/manifests/network.pp b/manifests/network.pp
index a6a81cbd..3dea9c18 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -121,7 +121,7 @@ class cloud::network(
   neutron_plugin_ml2 {
     'agent/tunnel_types':     value => ['gre'];
     'agent/l2_population':    value => true;
-    'agent/polling_interval': value => '2';
+    'agent/polling_interval': value => '15';
     'OVS/local_ip':           value => $tunnel_eth;
     'OVS/enable_tunneling':   value => true;
     'OVS/integration_bridge': value => 'br-int';
diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp
index 840ca6d1..b9c38c4b 100644
--- a/manifests/network/controller.pp
+++ b/manifests/network/controller.pp
@@ -40,6 +40,8 @@ class cloud::network::controller(
     auth_port           => $ks_keystone_public_port,
     database_connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8",
     api_workers         => $::processorcount,
+    agent_down_time     => '60',
+    report_interval     => '30',
   }
 
   # Note(EmilienM):
diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb
index 76bb4d61..d4138dd3 100644
--- a/spec/classes/cloud_network_controller_spec.rb
+++ b/spec/classes/cloud_network_controller_spec.rb
@@ -86,7 +86,9 @@ describe 'cloud::network::controller' do
           :auth_host           => '10.0.0.1',
           :auth_port           => '5000',
           :database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8',
-          :api_workers         => '2'
+          :api_workers         => '2',
+          :agent_down_time     => '60',
+          :report_interval     => '30'
         )
     end