diff --git a/tlbmc/central_config.proto b/tlbmc/central_config.proto
index 7e41af0..ec0cbba 100644
--- a/tlbmc/central_config.proto
+++ b/tlbmc/central_config.proto
@@ -202,6 +202,9 @@
   PowerFaultLogCollectorModule power_fault_log_collector_module = 9;
   SelCollectorModule sel_collector_module = 10;
   PcieCollectorModule pcie_collector_module = 11;
+
+  // If true, this platform uses the TLBMC Lite configuration as a base.
+  bool use_tlbmc_lite_config = 12;
 }
 
 message TlbmcConfigBundle {
@@ -211,4 +214,6 @@
   // Otherwise, the general config will be used.
   // The key is the platform name, and the value is the config for the platform.
   map<string, TlbmcConfig> platform_to_config = 2;
+  // The configuration for TLBMC Lite platforms.
+  TlbmcConfig tlbmc_lite_config = 3;
 }
diff --git a/tlbmc/central_config/config.cc b/tlbmc/central_config/config.cc
index 67fa511..2bf02b7 100644
--- a/tlbmc/central_config/config.cc
+++ b/tlbmc/central_config/config.cc
@@ -82,12 +82,17 @@
     return TlbmcConfig();
   }
   std::string platform_name = GetPlatformName(release_file_path);
-  config_bundle.mutable_general_config()->set_platform_name(platform_name);
+  TlbmcConfig merged_config = config_bundle.general_config();
   if (auto it = config_bundle.platform_to_config().find(platform_name);
       it != config_bundle.platform_to_config().end()) {
-    return MergeConfig(config_bundle.general_config(), it->second);
+    if (it->second.use_tlbmc_lite_config()) {
+      merged_config =
+          MergeConfig(merged_config, config_bundle.tlbmc_lite_config());
+    }
+    merged_config = MergeConfig(merged_config, it->second);
   }
-  return config_bundle.general_config();
+  merged_config.set_platform_name(platform_name);
+  return merged_config;
 }
 }  // namespace internal
 
