diff --git a/fedora-bootc.yaml b/fedora-bootc.yaml
index 9c91d95..9b61e19 100644
--- a/fedora-bootc.yaml
+++ b/fedora-bootc.yaml
@@ -1,7 +1,4 @@
 releasever: rawhide
-variables:
-  distro: "fedora"
-
 repos:
   - rawhide
 
@@ -10,5 +7,6 @@ metadata:
   summary: Fedora Bootable Tier 1
 
 include:
+  - fedora-generic.yaml
   - tier-1/manifest.yaml
   - tier-1/kernel.yaml
diff --git a/fedora-generic.yaml b/fedora-generic.yaml
new file mode 100644
index 0000000..4615024
--- /dev/null
+++ b/fedora-generic.yaml
@@ -0,0 +1,7 @@
+variables:
+  distro: "fedora"
+
+# Fedora-specific packages here
+packages:
+  # https://gitlab.com/fedora/bootc/base-images/-/issues/12
+  - fedora-repos-archive
diff --git a/fedora-tier-0.yaml b/fedora-tier-0.yaml
index ba0e9e2..c24d5c4 100644
--- a/fedora-tier-0.yaml
+++ b/fedora-tier-0.yaml
@@ -1,7 +1,4 @@
 releasever: rawhide
-variables:
-  distro: "fedora"
-
 repos:
   - rawhide
 
@@ -10,5 +7,6 @@ metadata:
   summary: Fedora Bootable Tier 0
 
 include:
+  - fedora-generic.yaml
   - tier-0/manifest.yaml
   - tier-0/kernel.yaml