diff --git a/deployment_scripts/puppet/modules/contrail/manifests/compute/vrouter.pp b/deployment_scripts/puppet/modules/contrail/manifests/compute/vrouter.pp
index 3a5117d12..3b1c00208 100644
--- a/deployment_scripts/puppet/modules/contrail/manifests/compute/vrouter.pp
+++ b/deployment_scripts/puppet/modules/contrail/manifests/compute/vrouter.pp
@@ -215,7 +215,7 @@ class contrail::compute::vrouter {
   } else {
     contrail_vrouter_agent_config {
       'TASK/thread_count':  value => '8';
-      'FLOWS/thread_count': value => '2';
+      'FLOWS/thread_count': value => $contrail::vrouter_thread_count;
     }
     file {'/etc/network/interfaces.d/ifcfg-vhost0':
       ensure  => present,
diff --git a/deployment_scripts/puppet/modules/contrail/manifests/init.pp b/deployment_scripts/puppet/modules/contrail/manifests/init.pp
index b6e8f0506..1efda8c16 100644
--- a/deployment_scripts/puppet/modules/contrail/manifests/init.pp
+++ b/deployment_scripts/puppet/modules/contrail/manifests/init.pp
@@ -112,6 +112,7 @@ class contrail {
   $external         = $settings['contrail_external']
   $route_target     = $settings['contrail_route_target']
   $gateways         = split($settings['contrail_gateways'], ',')
+  $vrouter_thread_count      = pick($settings['vrouter_thread_count'], '4')
 
   # DPDK settings
   $global_dpdk_enabled  = $settings['contrail_global_dpdk']