diff --git a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev.in b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev
similarity index 79%
rename from meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev.in
rename to meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev
index a7e9133..d890ef9 100644
--- a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev.in
+++ b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.netdev
@@ -1,7 +1,5 @@
 [NetDev]
 Name=gbmcbr
 Kind=bridge
-@MAC@
-@ADDR@
 [Bridge]
 STP=true
diff --git a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in
similarity index 93%
rename from meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network
rename to meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in
index 37aea6c..c6097bb 100644
--- a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network
+++ b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in
@@ -1,6 +1,7 @@
 [Match]
 Name=gbmcbr
 [Network]
+@ADDR@
 DHCP=false
 IPv6AcceptRA=true
 LLMNR=true