diff --git a/Rocky-9-Azure-Base.ks b/Rocky-9-Azure-Base.ks
index 795ef97..c2088b6 100644
--- a/Rocky-9-Azure-Base.ks
+++ b/Rocky-9-Azure-Base.ks
@@ -27,16 +27,16 @@ selinux --enforcing
 services --disabled="kdump,rhsmcertd" --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 --size=100  --fstype=efi      --asprimary
-part /boot     --size=1000 --fstype=xfs      --label=boot
-part prepboot  --size=4    --fstype=prepboot --asprimary
-part biosboot  --size=1    --fstype=biosboot --asprimary
-part /         --size=8000 --fstype="xfs"    --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-9-GenericCloud-Base.ks b/Rocky-9-GenericCloud-Base.ks
index 592df50..06e6c51 100644
--- a/Rocky-9-GenericCloud-Base.ks
+++ b/Rocky-9-GenericCloud-Base.ks
@@ -14,17 +14,15 @@ network  --bootproto=dhcp --device=link --activate --onboot=on
 services --disabled="kdump,rhsmcertd" --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
-# 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 /boot/efi --size=100  --fstype=efi      --asprimary
-part /boot     --size=1000 --fstype=xfs      --label=boot
-part prepboot  --size=4    --fstype=prepboot --asprimary
-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
 shutdown
 
 %pre
diff --git a/Rocky-9-OCP-Base.ks b/Rocky-9-OCP-Base.ks
index 13ec5d3..09c0020 100644
--- a/Rocky-9-OCP-Base.ks
+++ b/Rocky-9-OCP-Base.ks
@@ -33,6 +33,9 @@ services --disabled="kdump,rhsmcertd" --enabled="NetworkManager,sshd,rsyslog,chr
 bootloader --append="console=ttyS0,115200n8 console=tty0 no_timer_check crashkernel=auto net.ifnames=0 LANG=en_US.UTF-8 transparent_hugepage=never rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=rocky rd.lvm.lv=rocky/root rd.net.timeout.dhcp=10 libiscsi.debug_libiscsi_eh=1 netroot=iscsi:169.254.0.2:::1:iqn.2015-02.oracle.boot:uefi ip=dhcp rd.iscsi.bypass rd.iscsi.param=node.session.timeo.replacement_timeout=6000" --location=mbr --timeout=1 --boot-drive=vda
 
 # 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