diff --git a/fedora-riscv64-developer-f39.ks b/fedora-riscv64-developer-f39.ks
index 6ae0668..e2d1b5e 100644
--- a/fedora-riscv64-developer-f39.ks
+++ b/fedora-riscv64-developer-f39.ks
@@ -15,10 +15,15 @@ timezone --utc US/Eastern
 selinux --enforcing
 services --enabled=sshd,NetworkManager,chronyd,haveged --disabled=lm_sensors,libvirtd
 
-bootloader --location=mbr --timeout=1
-autopart --type=btrfs --noswap
 zerombr
-clearpart --all --initlabel --disklabel=msdos
+clearpart --all --initlabel --disklabel=gpt
+part /boot/efi --size=100  --fstype=efi
+part /boot     --size=1000  --fstype=ext4 --label=boot
+part btrfs.007 --size=2000 --fstype=btrfs --grow
+btrfs none --label=fedora btrfs.007
+btrfs /home --subvol --name=home LABEL=fedora
+btrfs /     --subvol --name=root LABEL=fedora
+bootloader --location=mbr --timeout=1
 
 
 # Halt the system once configuration has finished.