diff --git a/meta-google/conf/distro/gbmc.conf b/meta-google/conf/distro/gbmc.conf
index 1c2c20a..1311aa7 100644
--- a/meta-google/conf/distro/gbmc.conf
+++ b/meta-google/conf/distro/gbmc.conf
@@ -9,9 +9,11 @@
 EXTENDED_VERSION = "${DISTRO_VERSION}"
 DISTROOVERRIDES .= ":gbmc"
 
-# Possible values: "dev", "prod"
-GBMC_CONFIG ?= "dev"
+# Possible values: "dev", "prod", "local"
+GBMC_CONFIG ?= "local"
 OVERRIDES .= ":${GBMC_CONFIG}:"
+# local config will also include dev config
+OVERRIDES:append:local = ":dev:"
 
 DISTRO_FEATURES:remove = "avahi"
 DISTRO_FEATURES:remove = "ldap"