diff --git a/.orchestra/config/components.yml b/.orchestra/config/components.yml
index ea14bef982f9dfd591f5adf80f156bb35cc49c61..ba39fd6ea10bb1993f9ff14d13d265a911a333ea 100644
--- a/.orchestra/config/components.yml
+++ b/.orchestra/config/components.yml
@@ -1,7 +1,6 @@
 #@ load("@ytt:template", "template")
 #@ load("@ytt:data", "data")
 
-#@ load("/components/toolchain/arch/mips.lib.yml", "mips_toolchain_components")
 #@ load("/components/toolchain/arch/mipsel.lib.yml", "mipsel_toolchain_components")
 #@ load("/components/toolchain/arch/win32.lib.yml", "win32_toolchain_components")
 #@ load("/components/toolchain/arch/win64.lib.yml", "win64_toolchain_components")
@@ -10,7 +9,6 @@
 
 #@ load("/global_options.lib.yml", "options")
 components:
-  _: #@ template.replace(mips_toolchain_components)
   _: #@ template.replace(mipsel_toolchain_components)
 
   _: #@ template.replace(win64_toolchain_components)
diff --git a/.orchestra/config/components/toolchain/arch/mips.lib.yml b/.orchestra/config/components/toolchain/arch/mips.yml
similarity index 73%
rename from .orchestra/config/components/toolchain/arch/mips.lib.yml
rename to .orchestra/config/components/toolchain/arch/mips.yml
index 2b87836e32fec777394bd98c83730391cb10c4a9..5c70999f9a4cb78471b43eff4f0c762aa6d17e39 100644
--- a/.orchestra/config/components/toolchain/arch/mips.lib.yml
+++ b/.orchestra/config/components/toolchain/arch/mips.yml
@@ -1,3 +1,4 @@
+#@ load("@ytt:overlay", "overlay")
 #@ load("/components/toolchain/lib/toolchain.lib.yml", "create_toolchain_components")
 
 #@ def _params():
@@ -21,6 +22,7 @@ spec: true
 
 #@ end
 
+#@overlay/match by=overlay.all, expects=1
+#@overlay/match-child-defaults missing_ok=True
 ---
-
-#@ mips_toolchain_components = create_toolchain_components(**_params())
+components: #@ create_toolchain_components(**_params())