diff --git a/fedora-bootc.yaml b/fedora-bootc.yaml
index c3a89fa..e4cabcd 100644
--- a/fedora-bootc.yaml
+++ b/fedora-bootc.yaml
@@ -1,10 +1,10 @@
-releasever: 39
+releasever: 40
 variables:
-  distro: "eln"
+  distro: "fedora"
 
 repos:
-  - eln-baseos
-  - eln-appstream
+  - fedora-devel
+  - fedora-updates
 
 metadata:
   name: fedora-boot-tier1
diff --git a/fedora-eln-bootc.yaml b/fedora-eln-bootc.yaml
new file mode 100644
index 0000000..c3a89fa
--- /dev/null
+++ b/fedora-eln-bootc.yaml
@@ -0,0 +1,15 @@
+releasever: 39
+variables:
+  distro: "eln"
+
+repos:
+  - eln-baseos
+  - eln-appstream
+
+metadata:
+  name: fedora-boot-tier1
+  summary: Fedora Bootable Tier 1
+
+include:
+  - tier-1/manifest.yaml
+  - tier-1/kernel.yaml
diff --git a/fedora-tier-0-40.yaml b/fedora-tier-0-40.yaml
new file mode 100644
index 0000000..7840d56
--- /dev/null
+++ b/fedora-tier-0-40.yaml
@@ -0,0 +1,15 @@
+releasever: 40
+variables:
+  distro: "fedora"
+
+repos:
+  - fedora-devel
+  - fedora-updates
+
+metadata:
+  name: fedora-boot-tier0
+  summary: Fedora Bootable Tier 0
+
+include:
+  - tier-0/manifest.yaml
+  - tier-0/kernel.yaml
diff --git a/fedora-tier-0-rawhide.yaml b/fedora-tier-0-rawhide.yaml
new file mode 100644
index 0000000..ba0e9e2
--- /dev/null
+++ b/fedora-tier-0-rawhide.yaml
@@ -0,0 +1,14 @@
+releasever: rawhide
+variables:
+  distro: "fedora"
+
+repos:
+  - rawhide
+
+metadata:
+  name: fedora-boot-tier0
+  summary: Fedora Bootable Tier 0
+
+include:
+  - tier-0/manifest.yaml
+  - tier-0/kernel.yaml
diff --git a/fedora.repo b/fedora.repo
index c4bc1c8..6450124 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -74,3 +74,30 @@ gpgcheck=1
 metadata_expire=6h
 gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
 skip_if_unavailable=False
+
+[rawhide]
+name=Fedora - Rawhide - Developmental packages for the next Fedora release
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
+        https://dl.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+enabled=1
+#metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
+skip_if_unavailable=False
+
+[fedora-devel]
+name=Fedora $releasever - $basearch
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
+        https://dl.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+enabled=1
+#metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
+skip_if_unavailable=False
+