diff --git a/.orchestra/config/components.yml b/.orchestra/config/components.yml
index 2ebac426d0e9c8346fffc636f126071329340f17..b6f332b95c5fd8e2ac9a3e1ccdd984d728775e62 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/llvmcpy.lib.yml", "llvmcpy_component")
 #@ load("/components/clang_release.lib.yml", "clang_release_component")
 #@ load("/components/glib.lib.yml", "glib_component")
 #@ load("/components/glibc.lib.yml", "glibc_component")
@@ -46,7 +45,6 @@
 
 #@ load("/global_options.lib.yml", "options")
 components:
-  llvmcpy: #@ llvmcpy_component
   clang-release: #@ clang_release_component
   glib: #@ glib_component
   glibc: #@ glibc_component
diff --git a/.orchestra/config/components/llvmcpy.lib.yml b/.orchestra/config/components/llvmcpy.yml
similarity index 70%
rename from .orchestra/config/components/llvmcpy.lib.yml
rename to .orchestra/config/components/llvmcpy.yml
index eed3ba804cccb9eb9d8c4646113cc36e4f1d86cd..3a5e0aa5265db520fb8d2bb380999b8f8fb16d95 100644
--- a/.orchestra/config/components/llvmcpy.lib.yml
+++ b/.orchestra/config/components/llvmcpy.yml
@@ -1,3 +1,5 @@
+#@ load("@ytt:overlay", "overlay")
+
 #@ def _llvmcpy_component():
 repository: llvmcpy
 builds:
@@ -14,5 +16,8 @@ builds:
       python3 setup.py build --build-base "$SOURCE_DIR" install --home "$DESTDIR"
 #@ end
 
+#@overlay/match by=overlay.all, expects=1
+#@overlay/match-child-defaults missing_ok=True
 ---
-#@ llvmcpy_component = _llvmcpy_component()
+components:
+  llvmcpy: #@ _llvmcpy_component()