diff --git a/Rocky-8-Azure-Base.ks b/Rocky-8-Azure-Base.ks
index 28f9980..b4de844 100644
--- a/Rocky-8-Azure-Base.ks
+++ b/Rocky-8-Azure-Base.ks
@@ -27,16 +27,16 @@ selinux --enforcing
 services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd"
 # System bootloader configuration
 bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0  no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1
-# Clear the Master Boot Record
-#zerombr
-# Partition clearing information
-#clearpart --all --initlabel --disklabel=gpt
+
 # Disk partitioning information
-part /boot/efi --fstype="efi" --size=100
-part /boot --fstype="xfs" --size=1000 --label=boot
-part prepboot  --fstype=biosboot --asprimary --onpart=vda3
-part biosboot --fstype="biosboot" --size=1
-part / --fstype="xfs" --grow --size=8000 --mkfsoptions="-m bigtime=0,inobtcount=0"
+# NOTE(neil): 2023-05-12 NONE of reqpart, clearpart, zerombr can be used. We
+# are creating partitions manually in %pre to ensure proper ordering as
+# Anaconda does NOT ensure the ordering `part` commands.
+part /boot/efi --fstype="efi" --onpart=vda1
+part /boot --fstype="xfs" --label=boot --onpart=vda2
+part prepboot --fstype="prepboot" --onpart=vda3
+part biosboot --fstype="biosboot" --onpart=vda4
+part /         --size=8000 --fstype="xfs"    --mkfsoptions "-m bigtime=0,inobtcount=0" --grow --onpart=vda5
 
 %pre
 # Clear the Master Boot Record
diff --git a/Rocky-8-EC2-Base.ks b/Rocky-8-EC2-Base.ks
index 453a37b..2ebc4d6 100644
--- a/Rocky-8-EC2-Base.ks
+++ b/Rocky-8-EC2-Base.ks
@@ -14,16 +14,18 @@ rootpw --iscrypted thereisnopasswordanditslocked
 selinux --enforcing
 services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd"
 timezone UTC --isUtc
-# Disk
+
 bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0 nvme_core.io_timeout=4294967295 nvme_core.max_retries=10" --location=mbr --timeout=1
-#zerombr
-#clearpart --all --initlabel --disklabel=gpt
-#reqpart
-part /boot/efi --size=100  --fstype=efi      --asprimary
-part /boot     --size=1024 --fstype=xfs      --label=boot
-part prepboot  --fstype=biosboot --asprimary --onpart=vda3
-part biosboot  --size=1    --fstype=biosboot --asprimary
-part /         --size=8000 --fstype="xfs"    --mkfsoptions "-m bigtime=0,inobtcount=0"
+
+# Disk partitioning information
+# NOTE(neil): 2023-05-12 NONE of reqpart, clearpart, zerombr can be used. We
+# are creating partitions manually in %pre to ensure proper ordering as
+# Anaconda does NOT ensure the ordering `part` commands.
+part /boot/efi --fstype="efi" --onpart=vda1
+part /boot --fstype="xfs" --label=boot --onpart=vda2
+part prepboot --fstype="prepboot" --onpart=vda3
+part biosboot --fstype="biosboot" --onpart=vda4
+part /         --size=8000 --fstype="xfs"    --mkfsoptions "-m bigtime=0,inobtcount=0" --grow --onpart=vda5
 
 url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/
 
diff --git a/Rocky-8-GenericCloud-Base.ks b/Rocky-8-GenericCloud-Base.ks
index ac15983..98ca609 100644
--- a/Rocky-8-GenericCloud-Base.ks
+++ b/Rocky-8-GenericCloud-Base.ks
@@ -15,15 +15,15 @@ network  --hostname=localhost.localdomain
 services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd"
 rootpw --iscrypted thereisnopasswordanditslocked
 
-# Partition stuff
-zerombr
-clearpart --all --initlabel --disklabel=gpt
-#reqpart
-part /boot/efi --size=100  --fstype=efi      --asprimary
-part /boot     --size=1000 --fstype=xfs      --label=boot
-part prepboot  --fstype=biosboot --asprimary --onpart=vda3
-part biosboot  --size=1    --fstype=biosboot --asprimary
-part /         --size=8000 --fstype="xfs"    --mkfsoptions "-m bigtime=0,inobtcount=0" --grow
+# Disk partitioning information
+# NOTE(neil): 2023-05-12 NONE of reqpart, clearpart, zerombr can be used. We
+# are creating partitions manually in %pre to ensure proper ordering as
+# Anaconda does NOT ensure the ordering `part` commands.
+part /boot/efi --fstype="efi" --onpart=vda1
+part /boot --fstype="xfs" --label=boot --onpart=vda2
+part prepboot --fstype="prepboot" --onpart=vda3
+part biosboot --fstype="biosboot" --onpart=vda4
+part /         --size=8000 --fstype="xfs"    --mkfsoptions "-m bigtime=0,inobtcount=0" --grow --onpart=vda5
 shutdown
 
 url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/