diff --git a/composefs.yaml b/composefs.yaml
new file mode 100644
index 0000000..1081a8c
--- /dev/null
+++ b/composefs.yaml
@@ -0,0 +1,13 @@
+# Enable composefs
+# See: https://fedoraproject.org/wiki/Changes/ComposefsAtomicDesktops
+# https://fedoraproject.org/wiki/Changes/ComposefsAtomicCoreOSIoT
+postprocess:
+  - |
+    #!/usr/bin/env bash 
+    set -xeuo pipefail
+
+    cat >> /usr/lib/ostree/prepare-root.conf << 'EOF'
+    [composefs]
+    enabled = yes
+    EOF
+
diff --git a/fedora-iot-base.yaml b/fedora-iot-base.yaml
index 3b7ef65..2a03d17 100644
--- a/fedora-iot-base.yaml
+++ b/fedora-iot-base.yaml
@@ -2,6 +2,8 @@ include:
   - bootupd.yaml
   # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2305291
   - grub2-workaround.yaml
+  # Enable composefs
+  - composefs.yaml
 ref: fedora/devel/${basearch}/iot
 repos: []
 selinux: true