diff --git a/ofl/arima/METADATA.pb b/ofl/arima/METADATA.pb
index c3e7eaab36e5a7fb61ce92b68f20294e3167cbe5..200ffc112ba56d10f4329954fb5329c0bc5d3aee 100644
--- a/ofl/arima/METADATA.pb
+++ b/ofl/arima/METADATA.pb
@@ -28,6 +28,7 @@ axes {
 source {
   repository_url: "https://github.com/NDISCOVER/Arima-Font"
   commit: "c5fd72960f129076fbf3759d6d777cedcbceb468"
+  config_yaml: "sources/builder.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -40,5 +41,4 @@ source {
     source_file: "DESCRIPTION.en_us.html"
     dest_file: "DESCRIPTION.en_us.html"
   }
-  branch: "master"
 }
diff --git a/ofl/artifika/METADATA.pb b/ofl/artifika/METADATA.pb
index a5d53689b10626dac1ae6eeaf10a4eef2f37b587..d3fb3229790db7b30da201e9c1f459d5d5c2a0f5 100644
--- a/ofl/artifika/METADATA.pb
+++ b/ofl/artifika/METADATA.pb
@@ -17,6 +17,7 @@ subsets: "menu"
 source {
   repository_url: "https://github.com/cyrealtype/Artifika"
   commit: "50137a4bf13c4918f78d4b566d14ae3dde703456"
+  config_yaml: "sources/builder.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -29,5 +30,4 @@ source {
     source_file: "fonts/ttf/Artifika-Regular.ttf"
     dest_file: "Artifika-Regular.ttf"
   }
-  branch: "master"
 }
diff --git a/ofl/aubrey/METADATA.pb b/ofl/aubrey/METADATA.pb
index 8a0353b333f0beb82b86a43a575aeb23c6c955aa..97710770311bd754802dcc7212979f9d86c2134c 100644
--- a/ofl/aubrey/METADATA.pb
+++ b/ofl/aubrey/METADATA.pb
@@ -16,6 +16,8 @@ subsets: "latin"
 subsets: "menu"
 source {
   repository_url: "https://github.com/cyrealtype/Aubrey"
+  commit: "1946b0d99c0fec87702a59afc8b5b941a32e0171"
+  config_yaml: "sources/builder.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -28,5 +30,4 @@ source {
     source_file: "fonts/TTF/Aubrey-Regular.ttf"
     dest_file: "Aubrey-Regular.ttf"
   }
-  branch: "master"
 }
diff --git a/ofl/bhutukaexpandedone/METADATA.pb b/ofl/bhutukaexpandedone/METADATA.pb
index 55da4630da75d742c0515bee84d10929d6801d92..a8e7198b290f52edb8031f3b4cc9c3d14d193811 100644
--- a/ofl/bhutukaexpandedone/METADATA.pb
+++ b/ofl/bhutukaexpandedone/METADATA.pb
@@ -18,6 +18,8 @@ subsets: "latin-ext"
 subsets: "menu"
 source {
   repository_url: "https://github.com/erinmclaughlin/BhuTuka-Extended-One"
+  commit: "ac2ad17bcd23da70b2c63a4ed794cbb7a7ebaac6"
+  config_yaml: "sources/builder.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -30,7 +32,6 @@ source {
     source_file: "fonts/ttf/BhuTukaExpandedOne-Regular.ttf"
     dest_file: "BhuTukaExpandedOne-Regular.ttf"
   }
-  branch: "master"
 }
 stroke: "SLAB_SERIF"
 classifications: "DISPLAY"
diff --git a/ofl/blaka/METADATA.pb b/ofl/blaka/METADATA.pb
index 0fe9fa1dcce7ea50f6e38011397735df13489d45..321e6be5b88e6094e3d2e549f351e077346a34e8 100644
--- a/ofl/blaka/METADATA.pb
+++ b/ofl/blaka/METADATA.pb
@@ -19,6 +19,7 @@ subsets: "menu"
 source {
   repository_url: "https://github.com/Gue3bara/Blaka"
   commit: "7f264eee862d3e94c2cb6a728c6429c2f3b9adc3"
+  config_yaml: "sources/blakaregular.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -31,6 +32,5 @@ source {
     source_file: "DESCRIPTION.en_us.html"
     dest_file: "DESCRIPTION.en_us.html"
   }
-  branch: "master"
 }
 primary_script: "Arab"
diff --git a/ofl/blakahollow/METADATA.pb b/ofl/blakahollow/METADATA.pb
index d700f451796da31875d7bbba8158c026c0d69edd..3df7c4c287e3337b7a04f99e8fa8484ef0be5961 100644
--- a/ofl/blakahollow/METADATA.pb
+++ b/ofl/blakahollow/METADATA.pb
@@ -19,6 +19,7 @@ subsets: "menu"
 source {
   repository_url: "https://github.com/Gue3bara/Blaka"
   commit: "7f264eee862d3e94c2cb6a728c6429c2f3b9adc3"
+  config_yaml: "sources/blakahollow.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -31,6 +32,5 @@ source {
     source_file: "DESCRIPTION.en_us.html"
     dest_file: "DESCRIPTION.en_us.html"
   }
-  branch: "master"
 }
 primary_script: "Arab"
diff --git a/ofl/blakaink/METADATA.pb b/ofl/blakaink/METADATA.pb
index 5cfd617662caa304ccd6bc7c1e1181ba19308f6b..010b1083b9cb53c9580e4b6545112be6f77d2b64 100644
--- a/ofl/blakaink/METADATA.pb
+++ b/ofl/blakaink/METADATA.pb
@@ -19,6 +19,7 @@ subsets: "menu"
 source {
   repository_url: "https://github.com/Gue3bara/Blaka"
   commit: "7f264eee862d3e94c2cb6a728c6429c2f3b9adc3"
+  config_yaml: "sources/blakaink.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -31,6 +32,5 @@ source {
     source_file: "DESCRIPTION.en_us.html"
     dest_file: "DESCRIPTION.en_us.html"
   }
-  branch: "master"
 }
 primary_script: "Arab"
diff --git a/ofl/cactusclassicalserif/METADATA.pb b/ofl/cactusclassicalserif/METADATA.pb
index 1884e22778a25aaddd2345723c9be89f569c56d8..03615ed014a85ce9afd2a47cbb2da9ea80964333 100644
--- a/ofl/cactusclassicalserif/METADATA.pb
+++ b/ofl/cactusclassicalserif/METADATA.pb
@@ -20,7 +20,8 @@ subsets: "menu"
 subsets: "vietnamese"
 source {
   repository_url: "https://github.com/aaronbell/CactusSerif"
-  commit: "eb5a6eaf6a0f6d3d9ff63b64605c0bdbb9fec82b"
+  commit: "1d5b4158aa0411f7b1279f4bfa3f49416ba0b15d"
+  config_yaml: "sources/project.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -29,7 +30,6 @@ source {
     source_file: "fonts/ttf/CactusClassicalSerif-Regular.ttf"
     dest_file: "CactusClassicalSerif-Regular.ttf"
   }
-  branch: "main"
 }
 primary_script: "Hant"
 primary_language: "yue_Hant"
diff --git a/ofl/cairo/METADATA.pb b/ofl/cairo/METADATA.pb
index 80010611474b19236831bd3754a76ff83c2a2b76..c3403298a7663e06b2a998225f8b80fb33094496 100644
--- a/ofl/cairo/METADATA.pb
+++ b/ofl/cairo/METADATA.pb
@@ -30,6 +30,7 @@ axes {
 source {
   repository_url: "https://github.com/Gue3bara/Cairo"
   commit: "73d16933c6a0f341c27a69e401da83dcb0d53114"
+  config_yaml: "sources/cairo.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -38,6 +39,5 @@ source {
     source_file: "fonts/Cairo/variable/Cairo[slnt,wght].ttf"
     dest_file: "Cairo[slnt,wght].ttf"
   }
-  branch: "master"
 }
 primary_script: "Arab"
diff --git a/ofl/cairoplay/METADATA.pb b/ofl/cairoplay/METADATA.pb
index 488391e04dc86cd91117861b9e7a11887f31d879..64d9b89fd2a92ca45d23a206f2f1cc622bdcbca6 100644
--- a/ofl/cairoplay/METADATA.pb
+++ b/ofl/cairoplay/METADATA.pb
@@ -30,6 +30,7 @@ axes {
 source {
   repository_url: "https://github.com/Gue3bara/Cairo"
   commit: "73d16933c6a0f341c27a69e401da83dcb0d53114"
+  config_yaml: "sources/cairoplay.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -38,6 +39,5 @@ source {
     source_file: "fonts/CairoPlay/variable/CairoPlay[slnt,wght].ttf"
     dest_file: "CairoPlay[slnt,wght].ttf"
   }
-  branch: "master"
 }
 primary_script: "Arab"
diff --git a/ofl/chocolateclassicalsans/METADATA.pb b/ofl/chocolateclassicalsans/METADATA.pb
index ce59ad1af60732a313fedb60ec88e9df4e48af98..ef01188ca8cb76fdcb53dcfeba8844e7db590b98 100644
--- a/ofl/chocolateclassicalsans/METADATA.pb
+++ b/ofl/chocolateclassicalsans/METADATA.pb
@@ -20,7 +20,8 @@ subsets: "menu"
 subsets: "vietnamese"
 source {
   repository_url: "https://github.com/aaronbell/ChocolateSans"
-  commit: "ce0c3c542b943f1e56fddc54116f1c18326f5ba1"
+  commit: "91c9c5179adc1b2af2de1e3972d91e5e62c7bbc4"
+  config_yaml: "sources/project.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -29,7 +30,6 @@ source {
     source_file: "fonts/ttf/ChocolateClassicalSans-Regular.ttf"
     dest_file: "ChocolateClassicalSans-Regular.ttf"
   }
-  branch: "main"
 }
 primary_script: "Hant"
 primary_language: "yue_Hant"
diff --git a/ofl/diplomata/METADATA.pb b/ofl/diplomata/METADATA.pb
index bbfc8adb869a80ad742074cf6b7f5fcf026577f4..5e600b2393325d318834a255e6c2b896abce677b 100644
--- a/ofl/diplomata/METADATA.pb
+++ b/ofl/diplomata/METADATA.pb
@@ -18,6 +18,7 @@ subsets: "menu"
 source {
   repository_url: "https://github.com/etunni/diplomata"
   commit: "32dc35e6b420631acc10808e1f92f74e3048e81d"
+  config_yaml: "sources/diplomata.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -26,7 +27,6 @@ source {
     source_file: "fonts/diplomata/ttf/Diplomata-Regular.ttf"
     dest_file: "Diplomata-Regular.ttf"
   }
-  branch: "master"
 }
 stroke: "SERIF"
 classifications: "DISPLAY"
diff --git a/ofl/diplomatasc/METADATA.pb b/ofl/diplomatasc/METADATA.pb
index 1bf048c8237f6199b5b7e0b5908dcb556d13ca28..9535e9f56007c84c7c6cb5b87c359917e8621f4b 100644
--- a/ofl/diplomatasc/METADATA.pb
+++ b/ofl/diplomatasc/METADATA.pb
@@ -18,6 +18,7 @@ subsets: "menu"
 source {
   repository_url: "https://github.com/etunni/diplomata"
   commit: "32dc35e6b420631acc10808e1f92f74e3048e81d"
+  config_yaml: "sources/diplomatasc.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -26,7 +27,6 @@ source {
     source_file: "fonts/diplomatasc/ttf/DiplomataSC-Regular.ttf"
     dest_file: "DiplomataSC-Regular.ttf"
   }
-  branch: "master"
 }
 stroke: "SERIF"
 classifications: "DISPLAY"
diff --git a/ofl/hedvigletterssans/METADATA.pb b/ofl/hedvigletterssans/METADATA.pb
index cd550183673655b0dd1bc011f99c09105f1f29db..fb99284461e369995e246cb84be3b5db9c3ee4ad 100644
--- a/ofl/hedvigletterssans/METADATA.pb
+++ b/ofl/hedvigletterssans/METADATA.pb
@@ -20,6 +20,7 @@ subsets: "symbols"
 source {
   repository_url: "https://github.com/KanonFoundry/HedvigLetters"
   commit: "345b4d9015af6a26eb05e436460ca41fc42784df"
+  config_yaml: "sources/Sans.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -28,6 +29,5 @@ source {
     source_file: "fonts/HedvigLettersSans/ttf/HedvigLettersSans-Regular.ttf"
     dest_file: "HedvigLettersSans-Regular.ttf"
   }
-  branch: "main"
 }
 stroke: "SANS_SERIF"
diff --git a/ofl/hedviglettersserif/METADATA.pb b/ofl/hedviglettersserif/METADATA.pb
index a5a2f9fb125c31218c084b152635ed7ff87b971f..17762e400b26a22f9b41a3e1c0edc03c4cf4d1a9 100644
--- a/ofl/hedviglettersserif/METADATA.pb
+++ b/ofl/hedviglettersserif/METADATA.pb
@@ -29,6 +29,7 @@ registry_default_overrides {
 source {
   repository_url: "https://github.com/KanonFoundry/HedvigLetters"
   commit: "345b4d9015af6a26eb05e436460ca41fc42784df"
+  config_yaml: "sources/Serif.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -37,6 +38,5 @@ source {
     source_file: "fonts/HedvigLettersSerif/variable/HedvigLettersSerif[opsz].ttf"
     dest_file: "HedvigLettersSerif[opsz].ttf"
   }
-  branch: "main"
 }
 stroke: "SERIF"
diff --git a/ofl/lxgwwenkaimonotc/METADATA.pb b/ofl/lxgwwenkaimonotc/METADATA.pb
index 4b6d445bb688dd46e1dbe5eae577dd66adaac0a2..651350dfb44ed4f4f3966b72a86f498333e98d7b 100644
--- a/ofl/lxgwwenkaimonotc/METADATA.pb
+++ b/ofl/lxgwwenkaimonotc/METADATA.pb
@@ -43,6 +43,7 @@ subsets: "vietnamese"
 source {
   repository_url: "https://github.com/aaronbell/LxgwWenkaiTC"
   commit: "a5cf76f5bd1f26cdf74ca1b22b9f6fe17b8d5bc5"
+  config_yaml: "sources/project.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -59,7 +60,6 @@ source {
     source_file: "fonts/TTF/LXGWWenKaiMonoTC-Bold.ttf"
     dest_file: "LXGWWenKaiMonoTC-Bold.ttf"
   }
-  branch: "main"
 }
 primary_script: "Hant"
 primary_language: "zh_Hant"
diff --git a/ofl/lxgwwenkaitc/METADATA.pb b/ofl/lxgwwenkaitc/METADATA.pb
index a0893dd2532befbc1b2cdc25eded876085ac6768..86bb42b6923c3790dc0227ec66be5a576bc829a3 100644
--- a/ofl/lxgwwenkaitc/METADATA.pb
+++ b/ofl/lxgwwenkaitc/METADATA.pb
@@ -43,6 +43,7 @@ subsets: "vietnamese"
 source {
   repository_url: "https://github.com/aaronbell/LxgwWenkaiTC"
   commit: "a5cf76f5bd1f26cdf74ca1b22b9f6fe17b8d5bc5"
+  config_yaml: "sources/project.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -59,7 +60,6 @@ source {
     source_file: "fonts/TTF/LXGWWenKaiTC-Bold.ttf"
     dest_file: "LXGWWenKaiTC-Bold.ttf"
   }
-  branch: "main"
 }
 primary_script: "Hant"
 primary_language: "zh_Hant"
diff --git a/ofl/mate/METADATA.pb b/ofl/mate/METADATA.pb
index 5f112de89b3b00d3986727ba27333c1a0e944dda..1dfb105fb9ab78617dd39f3a2f232ce408e199e7 100644
--- a/ofl/mate/METADATA.pb
+++ b/ofl/mate/METADATA.pb
@@ -27,6 +27,7 @@ subsets: "menu"
 source {
   repository_url: "https://github.com/etunni/mate"
   commit: "2ea8febc952610379af663b1651411493d34beea"
+  config_yaml: "sources/mate.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -39,7 +40,6 @@ source {
     source_file: "fonts/mate/ttf/Mate-Italic.ttf"
     dest_file: "Mate-Italic.ttf"
   }
-  branch: "master"
 }
 stroke: "SERIF"
 classifications: "DISPLAY"
diff --git a/ofl/matesc/METADATA.pb b/ofl/matesc/METADATA.pb
index 1afe37e83a714baf8a019a39f099d93de7ad02d0..7e0e9c75d13b7731d89f5583a7d7677f2c9e2d2a 100644
--- a/ofl/matesc/METADATA.pb
+++ b/ofl/matesc/METADATA.pb
@@ -18,6 +18,7 @@ subsets: "menu"
 source {
   repository_url: "https://github.com/etunni/mate"
   commit: "2ea8febc952610379af663b1651411493d34beea"
+  config_yaml: "sources/matesc.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -26,5 +27,4 @@ source {
     source_file: "fonts/matesc/ttf/MateSC-Regular.ttf"
     dest_file: "MateSC-Regular.ttf"
   }
-  branch: "master"
 }
diff --git a/ofl/playpensansarabic/METADATA.pb b/ofl/playpensansarabic/METADATA.pb
index 800e0dcbb07839be512e784d76d5a87d0bcf5a9b..d8ebfac7f7e2a85ed91f2f62597d7bd15b23599d 100644
--- a/ofl/playpensansarabic/METADATA.pb
+++ b/ofl/playpensansarabic/METADATA.pb
@@ -26,6 +26,7 @@ axes {
 source {
   repository_url: "https://github.com/TypeTogether/Playpen-Sans"
   commit: "6990b3115c68779625bad656c6b0723db7435044"
+  config_yaml: "sources/config-Arabic.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -34,7 +35,6 @@ source {
     source_file: "fonts/variable/PlaypenSansArabic[wght].ttf"
     dest_file: "PlaypenSansArabic[wght].ttf"
   }
-  branch: "main"
 }
 minisite_url: "https://www.type-together.com/making-playpen-sans"
 primary_script: "Arab"
diff --git a/ofl/playpensanshebrew/METADATA.pb b/ofl/playpensanshebrew/METADATA.pb
index 33f6d4002c813541a9fd122435e0f2617f20d732..7e09a5ad817b54e8bc45ef807e3c7e981366feb8 100644
--- a/ofl/playpensanshebrew/METADATA.pb
+++ b/ofl/playpensanshebrew/METADATA.pb
@@ -26,6 +26,7 @@ axes {
 source {
   repository_url: "https://github.com/TypeTogether/Playpen-Sans"
   commit: "6990b3115c68779625bad656c6b0723db7435044"
+  config_yaml: "sources/config-Hebrew.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -34,7 +35,6 @@ source {
     source_file: "fonts/variable/PlaypenSansHebrew[wght].ttf"
     dest_file: "PlaypenSansHebrew[wght].ttf"
   }
-  branch: "main"
 }
 minisite_url: "https://www.type-together.com/making-playpen-sans"
 primary_script: "Hebr"
diff --git a/ofl/playpensansthai/METADATA.pb b/ofl/playpensansthai/METADATA.pb
index 22aa29692272ce15baf8cbcbaa9287e8d73c8e19..68b4e51ecb8f18fe7daf4af0d04c885a64a15903 100644
--- a/ofl/playpensansthai/METADATA.pb
+++ b/ofl/playpensansthai/METADATA.pb
@@ -26,6 +26,7 @@ axes {
 source {
   repository_url: "https://github.com/TypeTogether/Playpen-Sans"
   commit: "edaffec145577d12d6b5439ecb954b9f76a4a9a5"
+  config_yaml: "sources/config-Thai.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -34,7 +35,6 @@ source {
     source_file: "fonts/variable/PlaypenSansThai[wght].ttf"
     dest_file: "PlaypenSansThai[wght].ttf"
   }
-  branch: "main"
 }
 minisite_url: "https://www.type-together.com/making-playpen-sans"
 primary_script: "Thai"
diff --git a/ofl/wireone/METADATA.pb b/ofl/wireone/METADATA.pb
index 5b481c4db09c1ef9205b66c3d09e54c088c2d182..61c2dcb6dd4d94560e57d3b1bfd03e27a9c5bcc4 100644
--- a/ofl/wireone/METADATA.pb
+++ b/ofl/wireone/METADATA.pb
@@ -16,6 +16,8 @@ subsets: "latin"
 subsets: "menu"
 source {
   repository_url: "https://github.com/cyrealtype/Wire-One"
+  commit: "16db96d77889d4a8de2015ca5f3fc965446437d4"
+  config_yaml: "sources/builder.yaml"
   files {
     source_file: "OFL.txt"
     dest_file: "OFL.txt"
@@ -28,7 +30,6 @@ source {
     source_file: "fonts/TTF/WireOne-Regular.ttf"
     dest_file: "WireOne-Regular.ttf"
   }
-  branch: "master"
 }
 stroke: "SANS_SERIF"
 classifications: "DISPLAY"