diff --git a/Rocky-9-Vagrant-Libvirt.ks b/Rocky-9-Vagrant-Libvirt.ks
index 1d8a832..6f82c9f 100644
--- a/Rocky-9-Vagrant-Libvirt.ks
+++ b/Rocky-9-Vagrant-Libvirt.ks
@@ -25,13 +25,18 @@ skipx
 services --enabled="vmtoolsd"
 # System bootloader configuration
 bootloader --append="no_timer_check console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 elevator=noop" --location=mbr --timeout=1
-reqpart
-# Clear the Master Boot Record
+
+# Partition stuff
 zerombr
-# Partition clearing information
-clearpart --all --initlabel
-# Disk partitioning information
-part / --asprimary --fstype="xfs" --grow --size=1024
+clearpart --all --initlabel --disklabel=gpt
+#reqpart
+# This should allow BIOS, UEFI, and PReP booting. Trying to be as universal as
+# possible. This is a similar setup to Fedora without the btrfs.
+part prepboot  --size=4    --fstype=prepboot --asprimary
+part biosboot  --size=1    --fstype=biosboot --asprimary
+part /boot/efi --size=100  --fstype=efi      --asprimary
+part /boot     --size=1000 --fstype=xfs      --asprimary --label=boot
+part /         --size=8000 --fstype="xfs"    --mkfsoptions "-m bigtime=0,inobtcount=0"
 
 %post
 # configure swap to a file
diff --git a/Rocky-9-Vagrant-VMware.ks b/Rocky-9-Vagrant-VMware.ks
index d5f794f..c433d01 100644
--- a/Rocky-9-Vagrant-VMware.ks
+++ b/Rocky-9-Vagrant-VMware.ks
@@ -25,13 +25,18 @@ skipx
 services --enabled="vmtoolsd"
 # System bootloader configuration
 bootloader --append="no_timer_check console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 elevator=noop" --location=mbr --timeout=1
-reqpart
-# Clear the Master Boot Record
+
+# Partition stuff
 zerombr
-# Partition clearing information
-clearpart --all --initlabel
-# Disk partitioning information
-part / --asprimary --fstype="xfs" --grow --size=1024
+clearpart --all --initlabel --disklabel=gpt
+#reqpart
+# This should allow BIOS, UEFI, and PReP booting. Trying to be as universal as
+# possible. This is a similar setup to Fedora without the btrfs.
+part prepboot  --size=4    --fstype=prepboot --asprimary
+part biosboot  --size=1    --fstype=biosboot --asprimary
+part /boot/efi --size=100  --fstype=efi      --asprimary
+part /boot     --size=1000 --fstype=xfs      --asprimary --label=boot
+part /         --size=8000 --fstype="xfs"    --mkfsoptions "-m bigtime=0,inobtcount=0"
 
 %post
 # configure swap to a file
diff --git a/Rocky-9-Vagrant-Vbox.ks b/Rocky-9-Vagrant-Vbox.ks
index 0bec4f4..06eb946 100644
--- a/Rocky-9-Vagrant-Vbox.ks
+++ b/Rocky-9-Vagrant-Vbox.ks
@@ -25,13 +25,18 @@ skipx
 services --enabled="vmtoolsd"
 # System bootloader configuration
 bootloader --append="no_timer_check console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 elevator=noop" --location=mbr --timeout=1
-reqpart
-# Clear the Master Boot Record
+
+# Partition stuff
 zerombr
-# Partition clearing information
-clearpart --all --initlabel
-# Disk partitioning information
-part / --asprimary --fstype="xfs" --grow --size=1024
+clearpart --all --initlabel --disklabel=gpt
+#reqpart
+# This should allow BIOS, UEFI, and PReP booting. Trying to be as universal as
+# possible. This is a similar setup to Fedora without the btrfs.
+part prepboot  --size=4    --fstype=prepboot --asprimary
+part biosboot  --size=1    --fstype=biosboot --asprimary
+part /boot/efi --size=100  --fstype=efi      --asprimary
+part /boot     --size=1000 --fstype=xfs      --asprimary --label=boot
+part /         --size=8000 --fstype="xfs"    --mkfsoptions "-m bigtime=0,inobtcount=0"
 
 %post
 # configure swap to a file