diff --git a/fragments/platform/fedora_rawhide/storage/ostreecontainer_autopart.ks b/fragments/platform/fedora_rawhide/storage/ostreecontainer_autopart.ks
new file mode 100644
index 00000000..c82b8849
--- /dev/null
+++ b/fragments/platform/fedora_rawhide/storage/ostreecontainer_autopart.ks
@@ -0,0 +1,4 @@
+# Default storage configuration with lvm type enforced for Fedora
+zerombr
+clearpart --all
+autopart --type=lvm
diff --git a/fragments/shared/storage/ostreecontainer_autopart.ks b/fragments/shared/storage/ostreecontainer_autopart.ks
new file mode 100644
index 00000000..233a3fe6
--- /dev/null
+++ b/fragments/shared/storage/ostreecontainer_autopart.ks
@@ -0,0 +1,4 @@
+# Default storage configuration
+zerombr
+clearpart --all
+autopart
diff --git a/rpm-ostree-container-bootc.ks.in b/rpm-ostree-container-bootc.ks.in
index 54c22d2f..e0954b43 100644
--- a/rpm-ostree-container-bootc.ks.in
+++ b/rpm-ostree-container-bootc.ks.in
@@ -3,7 +3,9 @@
 # depends on the referenced ostree container being bootable
 
 # Use the default settings.
-%ksappend common/common_no_payload.ks
+%ksappend common/common_no_storage_and_payload.ks
+# On Fedora enforce lvm scheme (overriding btrfs default)
+%ksappend storage/ostreecontainer_autopart.ks
 
 ostreecontainer --no-signature-verification --remote=test-remote --stateroot=test-stateroot --url=@KSTEST_OSTREECONTAINER_URL@