diff --git a/meta-qca/recipes-facebook/coop/files/coop b/meta-qca/recipes-facebook/coop/files/coop
index f798ea5ef..7f7eeb2de 100755
--- a/meta-qca/recipes-facebook/coop/files/coop
+++ b/meta-qca/recipes-facebook/coop/files/coop
@@ -145,23 +145,6 @@ tap_global_address_add() {
             current_vpp_prefix=""
         fi

-        # Always check we have a default route
-        vpp_tap_ll_addr=$(ip -6 neighbor show dev ${LINUX_MAIN_TAP} | grep 'fe80:' | head -1 | awk '{print $1}')
-        if [ "${vpp_tap_ll_addr}" != "" ]
-        then
-            # Only delete + add default route if it's not out $LINUX_MAIN_TAP's Link Local
-            if ! ip -6 route show | grep -q "default.*fe80.*${LINUX_MAIN_TAP}"
-            then
-                echo "[$(date)] [INFO] Ensuring default route is via ${vpp_tap_ll_addr} dev ${LINUX_MAIN_TAP}"
-                ip -6 route delete default
-                ip -6 route add default via "${vpp_tap_ll_addr}" dev "${LINUX_MAIN_TAP}"
-            fi
-        else
-            echo "[$(date)] [ERROR] Unable to get Link Local address of neighbor on ${LINUX_MAIN_TAP}"
-            sleep "${DELAY}"
-            continue
-        fi
-
         # Check if we're in CPE mode and enable RA + add prefix if so
         # Don't require a global IPv6 address on Linux to configure this
         cpe_config
diff --git a/meta-qoriq/recipes-facebook/tg-vpp/files/etc/vpp/init.cmd b/meta-qoriq/recipes-facebook/tg-vpp/files/etc/vpp/init.cmd
index 7e9cd0af3..1f15f3b8f 100644
--- a/meta-qoriq/recipes-facebook/tg-vpp/files/etc/vpp/init.cmd
+++ b/meta-qoriq/recipes-facebook/tg-vpp/files/etc/vpp/init.cmd
@@ -1 +1,4 @@
 set logging class dpdk rate-limit 200
+enable ip6 interface vpp-vnet0
+set interface ip address vpp-vnet0 fe80::1/128
+ip6 nd vpp-vnet0 ra-interval 6 4