diff --git a/.orchestra/config/components.yml b/.orchestra/config/components.yml
index 4c2ef6b8ddc67c3f0584cc260702813b077f322c..f1918270e731b00ae802187cbaec6f98fe933002 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/aarch64.lib.yml", "aarch64_toolchain_components")
 #@ load("/components/toolchain/arch/s390x.lib.yml", "s390x_toolchain_components")
 #@ load("/components/toolchain/arch/mips.lib.yml", "mips_toolchain_components")
 #@ load("/components/toolchain/arch/mipsel.lib.yml", "mipsel_toolchain_components")
@@ -12,7 +11,6 @@
 
 #@ load("/global_options.lib.yml", "options")
 components:
-  _: #@ template.replace(aarch64_toolchain_components)
   _: #@ template.replace(s390x_toolchain_components)
   _: #@ template.replace(mips_toolchain_components)
   _: #@ template.replace(mipsel_toolchain_components)
diff --git a/.orchestra/config/components/toolchain/arch/aarch64.lib.yml b/.orchestra/config/components/toolchain/arch/aarch64.yml
similarity index 73%
rename from .orchestra/config/components/toolchain/arch/aarch64.lib.yml
rename to .orchestra/config/components/toolchain/arch/aarch64.yml
index ea7cff8a1fb3ac9b263dbbe3ed9cf45defc69df9..141a4f68ba3ecd42d15b7aefc009bf343db48747 100644
--- a/.orchestra/config/components/toolchain/arch/aarch64.lib.yml
+++ b/.orchestra/config/components/toolchain/arch/aarch64.yml
@@ -1,3 +1,4 @@
+#@ load("@ytt:overlay", "overlay")
 #@ load("/components/toolchain/lib/toolchain.lib.yml", "create_toolchain_components")
 
 #@ def _params():
@@ -19,6 +20,7 @@ extra_gcc_configure_options:
 dynamic: "0"
 #@ end
 
+#@overlay/match by=overlay.all, expects=1
+#@overlay/match-child-defaults missing_ok=True
 ---
-
-#@ aarch64_toolchain_components = create_toolchain_components(**_params())
+components: #@ create_toolchain_components(**_params())