diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in
index 9d9f789..96037ea 100644
--- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in
+++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in
@@ -37,6 +37,10 @@
     local pfx="$(ip_bytes_to_str pfx_bytes)"
     (( pfx_bytes[9] &= 0xf0 ))
     local stateless_pfx="$(ip_bytes_to_str pfx_bytes)"
+    local gbmcbr_mac="$(ip link show gbmcbr | tail -n 1 | awk '{print $2}')"
+    local gbmcbr_eui48="$(mac_to_eui48 "$gbmcbr_mac")"
+    local stateless_ip="$(ip_pfx_concat "$stateless_pfx/80" "$gbmcbr_eui48")"
+    stateless_ip="${stateless_ip%/*}"
     pfx_bytes[8]=0
     pfx_bytes[9]=0
     local host_pfx="$(ip_bytes_to_str pfx_bytes)"
@@ -48,6 +52,9 @@
 Address=$stateless_pfx/128
 PreferredLifetime=0
 [Address]
+Address=$stateless_ip/128
+PreferredLifetime=0
+[Address]
 Address=$host_pfx/128
 PreferredLifetime=0
 EOF