diff --git a/salt/top.sls b/salt/top.sls
index 4de636e..04b829e 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -38,9 +38,9 @@ base:
     - upstream.dhcp
     - upstream.shaping
     - upstream.dyndns
+    - upstream.port-forwarding
     - collectd
   'upstream2':
-    - upstream.port-forwarding
     - upstream.ipv6-tunnel
   'upstream1':
     - upstream.6slac