diff --git a/p4app/controller.py b/p4app/controller.py
index 121a0b0..480d037 100644
--- a/p4app/controller.py
+++ b/p4app/controller.py
@@ -90,12 +90,12 @@ class L2Controller(object):
         self.v6_addresses = {}
         self.v6_addresses[None] = []
         self.v6_addresses['base'] = []
-        self.v6_addresses['router'] = [ net['net'][42] for net in self.v6_routes['router'] ]
+        self.v6_addresses['router'] = [ net['net'][self.info['switch_suffix']] for net in self.v6_routes['router'] ]
 
         self.v4_addresses = {}
         self.v4_addresses[None] = []
         self.v4_addresses['base'] = []
-        self.v4_addresses['router'] = [ net['net'][42] for net in self.v4_routes['router'] ]
+        self.v4_addresses['router'] = [ net['net'][self.info['switch_suffix']] for net in self.v4_routes['router'] ]
 
         self.init_boilerplate(sw_name)