diff --git a/cmd/romana_agent/main.go b/cmd/romana_agent/main.go
index 93c90d7..368c3a2 100644
--- a/cmd/romana_agent/main.go
+++ b/cmd/romana_agent/main.go
@@ -46,8 +46,6 @@ const (
 
 var (
 	kernelParameter = []string{
-		"/proc/sys/net/ipv4/conf/default/proxy_arp",
-		"/proc/sys/net/ipv4/conf/all/proxy_arp",
 		"/proc/sys/net/ipv4/ip_forward",
 	}
 )
diff --git a/cni/plugin.go b/cni/plugin.go
index 7f26849..256e456 100644
--- a/cni/plugin.go
+++ b/cni/plugin.go
@@ -197,6 +197,12 @@ func CmdAdd(args *skel.CmdArgs) error {
 		return fmt.Errorf("Failed to create veth interfaces in namespace %v, err=(%s)", netns, err)
 	}
 
+	// enable proxy_arp
+	err = ioutil.WriteFile(fmt.Sprintf("/proc/sys/net/ipv4/conf/%s/proxy_arp", hostIface.Name), []byte("1"), 0)
+	if err != nil {
+		return fmt.Errorf("Failed to set proxy_arp for %s, err=(%s)", hostIface.Name, err)
+	}
+
 	// set proxy_delay to zero
 	err = ioutil.WriteFile(fmt.Sprintf("/proc/sys/net/ipv4/neigh/%s/proxy_delay", hostIface.Name), []byte("0"), 0)
 	if err != nil {