diff --git a/build_debian.sh b/build_debian.sh
index 767dd7b83b79..8c38eca62e47 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -302,6 +302,7 @@ set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_notify 1
 set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_ignore 2
 
 set /files/etc/sysctl.conf/net.ipv4.neigh.default.base_reachable_time_ms 1800000
+set /files/etc/sysctl.conf/net.ipv6.neigh.default.base_reachable_time_ms 1800000
 
 set /files/etc/sysctl.conf/net.ipv6.conf.default.forwarding 1
 set /files/etc/sysctl.conf/net.ipv6.conf.all.forwarding 1
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index eceb82a06c76..2d204df9078f 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -10,6 +10,7 @@ RUN apt-get update
 
 RUN apt-get install -f -y ifupdown arping libdbus-1-3 libdaemon0 libjansson4
 
+RUN apt-get install -f -y ndisc6
 ## Install redis-tools dependencies
 ## TODO: implicitly install dependencies
 RUN apt-get -y install libjemalloc1
diff --git a/files/scripts/arp_update b/files/scripts/arp_update
index ab44ca6a4580..f7c5ec8bb856 100755
--- a/files/scripts/arp_update
+++ b/files/scripts/arp_update
@@ -1,10 +1,28 @@
 #!/bin/bash
 #
 # usage:
-# arp_update: Send gratuitous ARP requests to VLAN member neighbors to refresh
-# the neighbors state.
+# arp_update:
+# Send ipv6 multicast pings to all "UP" L3 interfaces including vlan interfaces to
+# refresh link-local addresses from neighbors.
+# Send gratuitous ARP/NDP requests to VLAN member neighbors to refresh
+# the ipv4/ipv6 neighbors state.
 
 while /bin/true; do
+  # find L3 interfaces which are UP, send ipv6 multicast pings
+  echo "{% for (name, prefix) in INTERFACE %} {{name}} {% endfor %}" > /tmp/intf_tmp.j2
+  INTERFACE=`sonic-cfggen -d -t /tmp/intf_tmp.j2`
+  echo "{% for (name, prefix) in PORTCHANNEL_INTERFACE %} {{name}} {% endfor %}" > /tmp/pc_intf_tmp.j2
+  PC_INTERFACE=`sonic-cfggen -d -t /tmp/pc_intf_tmp.j2`
+
+  ALL_INTERFACE="$INTERFACE $PC_INTERFACE"
+  for intf in $ALL_INTERFACE; do
+      ping6cmd="ping6 -I $intf -n -q -i 0 -c 1 -W 0 ff02::1 >/dev/null"
+      intf_up=$(ip link show $intf | grep "state UP")
+      if [[ -n "$intf_up" ]]; then
+          eval $ping6cmd
+      fi
+  done
+
   VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
   for vlan in $VLAN; do
       # generate a list of arping commands:
@@ -15,6 +33,18 @@ while /bin/true; do
       ipcmd="ip -4 neigh show | grep $vlan | cut -d ' ' -f 1,3 | $arpingcmd"
 
       eval `eval $ipcmd`
+
+      # send ipv6 multicast pings to Vlan interfaces to get/refresh link-local addrs
+      ping6cmd="ping6 -I $vlan -n -q -i 0 -c 1 -W 0 ff02::1 >/dev/null"
+      eval $ping6cmd
+
+      # generate a list of ndisc6 commands (exclude link-local addrs since it is done above):
+      #   ndisc6 -q -w 0 -1 <IP 1> <VLAN interface>;
+      #   ndisc6 -q -w 0 -1 <IP 2> <VLAN interface>;
+      #   ...
+      ndisc6cmd="sed -e 's/^/ndisc6 -q -w 0 -1 /' -e 's/$/;/'"
+      ip6cmd="ip -6 neigh show | grep -v fe80 | grep $vlan | cut -d ' ' -f 1,3 | $ndisc6cmd"
+      eval `eval $ip6cmd`
   done
   sleep 300
 done
diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2
index 2d9b72aa3298..ded75caff524 100644
--- a/platform/vs/docker-sonic-vs/Dockerfile.j2
+++ b/platform/vs/docker-sonic-vs/Dockerfile.j2
@@ -13,6 +13,7 @@ RUN apt-get update
 
 RUN apt-get install -y net-tools \
                        arping \
+                       ndisc6 \
                        ethtool \
                        tcpdump \
                        ifupdown \