diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 2a33ff9..9b81f36 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -10,9 +10,11 @@ container-cmd:
 include: fedora-common-ostree-pkgs.yaml
 
 # See https://github.com/coreos/bootupd
-arch-include:
-  x86_64: bootupd.yaml
-  aarch64: bootupd.yaml
+# TODO: Disabled until we use use unified-core or native container flow
+# for the main build
+# arch-include:
+#   x86_64: bootupd.yaml
+#   aarch64: bootupd.yaml
 
 packages:
   # Do not include "full" Git as it brings in Perl