diff --git a/modules/common/configs/config_gflags.cc b/modules/common/configs/config_gflags.cc
index 2913c0d1643a5ec94bac8b15019882d417b76cba..2f1d2da3ebf976695641649275930a3d6d5d3773 100644
--- a/modules/common/configs/config_gflags.cc
+++ b/modules/common/configs/config_gflags.cc
@@ -16,7 +16,7 @@
 
 #include "modules/common/configs/config_gflags.h"
 
-DEFINE_string(map_dir, "modules/map/data/sunnyvale_loop",
+DEFINE_string(map_dir, "modules/map/data/demo",
               "Directory which contains a group of related maps.");
 
 DEFINE_string(base_map_filename, "base_map.xml|base_map.bin|base_map.txt",
diff --git a/modules/common/data/global_flagfile.txt b/modules/common/data/global_flagfile.txt
index 89efff62ea584aee796b2f4c729190f6a1f538ff..7efba137a0d6c862dfd0471a3831fd15cd06a0cd 100644
--- a/modules/common/data/global_flagfile.txt
+++ b/modules/common/data/global_flagfile.txt
@@ -7,4 +7,4 @@
 
 --vehicle_config_path=modules/common/data/mkz_config.pb.txt
 
-#--map_dir=modules/map/data/sunnyvale_loop
+--map_dir=modules/map/data/sunnyvale_office