diff --git a/bootc-c9s.repo b/bootc-c9s.repo
new file mode 100644
index 0000000..579dce4
--- /dev/null
+++ b/bootc-c9s.repo
@@ -0,0 +1,10 @@
+[bootc-c9s]
+name=Copr repo for bootc owned by walters
+baseurl=https://download.copr.fedorainfracloud.org/results/walters/bootc/centos-stream-9-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://download.copr.fedorainfracloud.org/results/walters/bootc/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1
diff --git a/bootc-fedora.repo b/bootc-fedora.repo
new file mode 100644
index 0000000..4a856d0
--- /dev/null
+++ b/bootc-fedora.repo
@@ -0,0 +1,11 @@
+[bootc-fedora]
+name=Copr repo for bootc owned by walters
+baseurl=https://download.copr.fedorainfracloud.org/results/walters/bootc/fedora-$releasever-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://download.copr.fedorainfracloud.org/results/walters/bootc/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1
+
diff --git a/c9s.yaml b/c9s.yaml
index aa73fd4..8983d03 100644
--- a/c9s.yaml
+++ b/c9s.yaml
@@ -3,6 +3,7 @@ releasever: stream9
 repos:
   - baseos
   - appstream
+  - bootc-c9s
 
 metadata:
   name: c9s-oscore
diff --git a/fedora.yaml b/fedora.yaml
index caa8f58..b5baa4f 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -3,6 +3,7 @@ releasever: 37
 repos:
   - fedora
   - fedora-updates
+  - bootc-fedora
 
 metadata:
   name: fedora-oscore
diff --git a/oscore/bootable-rpm-ostree.yaml b/oscore/bootable-rpm-ostree.yaml
index c93ecbe..55f540e 100644
--- a/oscore/bootable-rpm-ostree.yaml
+++ b/oscore/bootable-rpm-ostree.yaml
@@ -11,30 +11,10 @@ packages:
  # https://gitlab.com/cki-project/kernel-ark/-/commit/32271d0cd9bd52d386eb35497c4876a8f041f70b
  # https://src.fedoraproject.org/rpms/kernel/c/f55c3e9ed8605ff28cb9a922efbab1055947e213?branch=rawhide
  - linux-firmware
+ - bootc
  # rpm-ostree
  - rpm-ostree nss-altfiles
 
-# bootloader
-packages-aarch64:
-  - grub2-efi-aa64 efibootmgr shim
-  # firmware updates
-  - fwupd
-packages-ppc64le:
-  - grub2 ostree-grub2
-  # firmware updates
-  - fwupd
-packages-s390x:
-  # On Fedora, this is provided by s390utils-core. on RHEL, this is for now
-  # provided by s390utils-base, but soon will be -core too.
-  - /usr/sbin/zipl
-  # for Secure Execution
-  - veritysetup
-packages-x86_64:
-  - grub2 grub2-efi-x64 efibootmgr shim
-  - microcode_ctl
-  # firmware updates
-  - fwupd
-
 postprocess:
   # See: https://github.com/coreos/fedora-coreos-tracker/issues/1253
   #      https://bugzilla.redhat.com/show_bug.cgi?id=2112857
diff --git a/oscore/bootupd.yaml b/oscore/bootupd.yaml
index ca8c5de..b3570b5 100644
--- a/oscore/bootupd.yaml
+++ b/oscore/bootupd.yaml
@@ -1,8 +1,21 @@
-# Integration with https://github.com/coreos/bootupd
+# Integration with https://github.com/coreos/bootupd and bootloader logic
 # xref https://github.com/coreos/fedora-coreos-tracker/issues/510
 packages:
   - bootupd
 
+# bootloader
+packages-aarch64:
+  - grub2-efi-aa64 efibootmgr shim
+packages-ppc64le:
+  - grub2 ostree-grub2
+packages-s390x:
+  # On Fedora, this is provided by s390utils-core. on RHEL, this is for now
+  # provided by s390utils-base, but soon will be -core too.
+  - /usr/sbin/zipl
+packages-x86_64:
+  - grub2 grub2-efi-x64 efibootmgr shim
+  - microcode_ctl
+
 postprocess:
   - |
     #!/bin/bash
diff --git a/oscore/fwupd.yaml b/oscore/fwupd.yaml
new file mode 100644
index 0000000..0045a30
--- /dev/null
+++ b/oscore/fwupd.yaml
@@ -0,0 +1,5 @@
+# Firmware updates
+packages-aarch64:
+  - fwupd
+packages-x86_64:
+  - fwupd
diff --git a/oscore/manifest.yaml b/oscore/manifest.yaml
index 86f1c5d..6a9570f 100644
--- a/oscore/manifest.yaml
+++ b/oscore/manifest.yaml
@@ -32,6 +32,7 @@ include:
   - system-configuration.yaml
   - user-experience.yaml
   - shared-workarounds.yaml
+  - fwupd.yaml
 
 conditional-include:
   - if: basearch != "s390x"