diff --git a/salt-pillar/upstream/anon1.sls b/salt-pillar/upstream/anon1.sls
index 32dc624..4b7e1fc 100644
--- a/salt-pillar/upstream/anon1.sls
+++ b/salt-pillar/upstream/anon1.sls
@@ -1,4 +1,5 @@
 upstream:
   interface: ipredator
-  up-bandwidth: 2000
+  up-bandwidth: 4000
   flow-keys: nfct-src
+  flows: 4096
diff --git a/salt-pillar/upstream/upstream1.sls b/salt-pillar/upstream/upstream1.sls
index 2557bbd..f1ae4f6 100644
--- a/salt-pillar/upstream/upstream1.sls
+++ b/salt-pillar/upstream/upstream1.sls
@@ -1,4 +1,5 @@
 upstream:
   interface: up1
-  up-bandwidth: 6000
+  up-bandwidth: 6200
   flow-keys: nfct-src
+  flows: 2048
diff --git a/salt-pillar/upstream/upstream2.sls b/salt-pillar/upstream/upstream2.sls
index f6eec9f..36a51fd 100644
--- a/salt-pillar/upstream/upstream2.sls
+++ b/salt-pillar/upstream/upstream2.sls
@@ -1,4 +1,5 @@
 upstream:
   interface: up2
-  up-bandwidth: 6000
+  up-bandwidth: 6200
   flow-keys: nfct-src
+  flows: 2048
diff --git a/salt/upstream/shaping b/salt/upstream/shaping
index de046af..23284db 100644
--- a/salt/upstream/shaping
+++ b/salt/upstream/shaping
@@ -4,6 +4,6 @@ if [ "$IFACE" = "{{ pillar['upstream']['interface'] }}" ]; then
    tc qdisc del dev $IFACE root    2> /dev/null >  /dev/null
    tc qdisc add dev $IFACE root       handle  1   hfsc default 1
    tc class add dev $IFACE parent 1:  classid 1:1  hfsc sc rate {{ pillar['upstream']['up-bandwidth'] }}kbit ul rate {{ pillar['upstream']['up-bandwidth'] }}kbit
-   tc qdisc add dev $IFACE parent 1:1 handle 11: fq_codel
-   tc filter add dev $IFACE parent 11: handle 11 protocol all flow hash keys {{ pillar['upstream']['flow-keys'] }} divisor 1024
+   tc qdisc add dev $IFACE parent 1:1 handle 11: fq_codel flows  {{ pillar['upstream']['flows'] }}
+   tc filter add dev $IFACE parent 11: handle 11 protocol all flow hash keys {{ pillar['upstream']['flow-keys'] }} divisor {{ pillar['upstream']['flows'] }}
 fi