diff --git a/.orchestra/config/components.yml b/.orchestra/config/components.yml
index 42ab2d8c71495881065adda226299e8192f660b8..e9aec83aa1ab4035fe6fb937320a9db5420e4a69 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/qt_creator.lib.yml", "qt_creator_component")
 #@ load("/components/ui/graphviz.lib.yml", "graphviz_component")
 #@ load("/components/ui/adaptagrams.lib.yml", "adaptagrams_component")
 #@ load("/components/ui/cold_revng.lib.yml", "cold_revng_component")
@@ -25,7 +24,6 @@
 
 #@ load("/global_options.lib.yml", "options")
 components:
-  ui/qt-creator: #@ qt_creator_component
   ui/graphviz: #@ graphviz_component
   ui/adaptagrams: #@ adaptagrams_component
   ui/cold-revng: #@ cold_revng_component
diff --git a/.orchestra/config/components/ui/qt_creator.lib.yml b/.orchestra/config/components/ui/qt_creator.yml
similarity index 90%
rename from .orchestra/config/components/ui/qt_creator.lib.yml
rename to .orchestra/config/components/ui/qt_creator.yml
index 087bcc2421e5cb4f2e1ba7b8b66b88c0972b33d9..a1f0f9c6d6b854f1185ada94212453f59299f6c3 100644
--- a/.orchestra/config/components/ui/qt_creator.lib.yml
+++ b/.orchestra/config/components/ui/qt_creator.yml
@@ -1,3 +1,4 @@
+#@ load("@ytt:overlay", "overlay")
 #@ load("/lib/make.lib.yml", "make")
 #@ load("/lib/shell.lib.yml", "expand_args")
 #@ load("/lib/optimization_flavors.lib.yml", "qmake_optimization_flavors")
@@ -62,6 +63,8 @@ builds:
   #@ end
 #@ end
 
+#@overlay/match by=overlay.all, expects=1
+#@overlay/match-child-defaults missing_ok=True
 ---
-
-#@ qt_creator_component = _qt_creator_component()
+components:
+  ui/qt-creator: #@ _qt_creator_component()