diff --git a/lib/build-tokens.js b/lib/build-tokens.js
index e9213df94a5..b2df2129f6c 100755
--- a/lib/build-tokens.js
+++ b/lib/build-tokens.js
@@ -199,8 +199,11 @@ async function buildTokensCommand(commandArgs) {
     ...coreConfig,
     include: [
       ...coreConfig.include,
+      ...coreConfig.source,
       path.resolve(__dirname, '../tokens/src/themes/light/**/*.json'),
       path.resolve(__dirname, '../tokens/src/themes/light/**/*.toml'),
+      `${tokensSource}/themes/light/**/*.json`,
+      `${tokensSource}/themes/light/**/*.toml`,
     ],
     source: [
       `${tokensPath}/apps/${appName}/**/*.json`,