diff --git a/Rocky-8-Vagrant-Libvirt.ks b/Rocky-8-Vagrant-Libvirt.ks
index a85bb50..c5c8257 100644
--- a/Rocky-8-Vagrant-Libvirt.ks
+++ b/Rocky-8-Vagrant-Libvirt.ks
@@ -26,13 +26,15 @@ 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
 zerombr
 # Partition clearing information
-clearpart --all --initlabel
+clearpart --all --initlabel --disklabel=gpt
 # Disk partitioning information
-part / --asprimary --fstype="xfs" --grow --size=1024
+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" --grow
 
 %post
 # configure swap to a file
diff --git a/Rocky-8-Vagrant-VMware.ks b/Rocky-8-Vagrant-VMware.ks
index e17ea23..608faeb 100644
--- a/Rocky-8-Vagrant-VMware.ks
+++ b/Rocky-8-Vagrant-VMware.ks
@@ -26,13 +26,15 @@ 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
 zerombr
 # Partition clearing information
-clearpart --all --initlabel
+clearpart --all --initlabel --disklabel=gpt
 # Disk partitioning information
-part / --asprimary --fstype="xfs" --grow --size=1024
+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" --grow
 
 %post
 # configure swap to a file
diff --git a/Rocky-8-Vagrant-Vbox.ks b/Rocky-8-Vagrant-Vbox.ks
index 51cd3e2..8704af2 100644
--- a/Rocky-8-Vagrant-Vbox.ks
+++ b/Rocky-8-Vagrant-Vbox.ks
@@ -26,13 +26,15 @@ 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
 zerombr
 # Partition clearing information
-clearpart --all --initlabel
+clearpart --all --initlabel --disklabel=gpt
 # Disk partitioning information
-part / --asprimary --fstype="xfs" --grow --size=1024
+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" --grow
 
 %post
 # configure swap to a file
diff --git a/vagrant/rocky-vagrant-base.ks b/vagrant/rocky-vagrant-base.ks
index 5b8ab31..82f8020 100644
--- a/vagrant/rocky-vagrant-base.ks
+++ b/vagrant/rocky-vagrant-base.ks
@@ -14,10 +14,11 @@ services --enabled=vmtoolsd
 # even in environments like virtualbox that emulate a real NW card
 bootloader --timeout=1 --append="no_timer_check console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 elevator=noop"
 zerombr
-clearpart --all --initlabel
-reqpart
-part / --fstype=xfs --asprimary --size=1024 --grow
-
+clearpart --all --initlabel --disklabel=gpt
+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" --grow
 user --name=vagrant --plaintext --password=vagrant
 
 shutdown