diff --git a/p4app/controller.py b/p4app/controller.py
index f9ad271..37067f7 100644
--- a/p4app/controller.py
+++ b/p4app/controller.py
@@ -107,11 +107,8 @@ class L2Controller(object):
 
 
         self.controller.table_clear("ndp")
-        for port in ["4"]:
-            self.controller.table_add("ndp", "multicast_pkg", [ndp_prefix, port], ["1"])
-            self.controller.table_add("ndp", "multicast_pkg", [ndp_prefix, port], [1])
-            self.controller.table_add("ndp", "multicast_pkg", [ndp_prefix, port], [port])
-            self.controller.table_add("ndp", "multicast_pkg", ["ff02::1:ff00:0/104", "3"], ["3"])
+        for port in all_ports:
+            self.controller.table_add("ndp", "multicast_pkg", [ndp_prefix, str(port)], [str(port)])
 
 
     def init_boilerplate(self, sw_name):