diff --git a/.orchestra/config/components.yml b/.orchestra/config/components.yml
index 0d365472de858ba53d9de698ff92ff578d5b26d5..46dd82e2b0c05e5f7269eb5800061e1ba4e14105 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/ui/mesa.lib.yml", "mesa_component")
 #@ load("/components/ui/libglvnd.lib.yml", "libglvnd_component")
 
 #@ load("/components/toolchain/arch/host.lib.yml", "host_toolchain_components")
@@ -19,7 +18,6 @@
 
 #@ load("/global_options.lib.yml", "options")
 components:
-  ui/mesa: #@ mesa_component
   ui/libglvnd: #@ libglvnd_component
 
   _: #@ template.replace(host_toolchain_components)
diff --git a/.orchestra/config/components/ui/mesa.lib.yml b/.orchestra/config/components/ui/mesa.yml
similarity index 91%
rename from .orchestra/config/components/ui/mesa.lib.yml
rename to .orchestra/config/components/ui/mesa.yml
index b14af348fd3ba3da5b91952d33dc1fc2648ad354..36e7b5a7a15b50e5fc25a2e45fd7cb53fca01282 100644
--- a/.orchestra/config/components/ui/mesa.lib.yml
+++ b/.orchestra/config/components/ui/mesa.yml
@@ -1,3 +1,4 @@
+#@ load("@ytt:overlay", "overlay")
 #@ load("/lib/create_component.lib.yml", "single_build_component")
 
 #@ load("/global_options.lib.yml", "options")
@@ -67,5 +68,8 @@ dependencies:
   - toolchain/host/gcc
 #@ end
 
+#@overlay/match by=overlay.all, expects=1
+#@overlay/match-child-defaults missing_ok=True
 ---
-#@ mesa_component = single_build_component(**_mesa_args())
+components:
+  ui/mesa: #@ single_build_component(**_mesa_args())