diff --git a/manifests/composefs.yaml b/manifests/composefs.yaml
new file mode 100644
index 0000000000..d575c1349b
--- /dev/null
+++ b/manifests/composefs.yaml
@@ -0,0 +1,3 @@
+# Enable composefs by default.
+ostree-layers:
+  - overlay/08composefs
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index 0be3297d23..ab36825bfe 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -46,6 +46,8 @@ conditional-include:
   # Wifi firmwares will be dropped in F41
   - if: releasever < 41
     include: wifi-firmwares.yaml
+  - if: stream == "rawhide"
+    include: composefs.yaml
 
 ostree-layers:
   - overlay/15fcos
diff --git a/overlay.d/08composefs/README.md b/overlay.d/08composefs/README.md
new file mode 100644
index 0000000000..487f8be8f4
--- /dev/null
+++ b/overlay.d/08composefs/README.md
@@ -0,0 +1,2 @@
+Enable composefs by default; more in https://ostreedev.github.io/ostree/composefs/
+For now rawhide only.
diff --git a/overlay.d/08composefs/usr/lib/ostree/prepare-root.conf b/overlay.d/08composefs/usr/lib/ostree/prepare-root.conf
new file mode 100644
index 0000000000..2faae22bc9
--- /dev/null
+++ b/overlay.d/08composefs/usr/lib/ostree/prepare-root.conf
@@ -0,0 +1,2 @@
+[composefs]
+enabled = true