diff --git a/Rocky-9-Azure.ks b/Rocky-9-Azure-Base.ks
similarity index 100%
rename from Rocky-9-Azure.ks
rename to Rocky-9-Azure-Base.ks
diff --git a/Rocky-9-Azure-LVM.ks b/Rocky-9-Azure-LVM.ks
index 13ef33f..35e4ecc 100644
--- a/Rocky-9-Azure-LVM.ks
+++ b/Rocky-9-Azure-LVM.ks
@@ -17,6 +17,8 @@ rootpw --iscrypted thereisnopasswordanditslocked
 # Partition Stuff
 zerombr
 clearpart --all --initlabel 
+part /boot --fstype xfs --size 1024 --asprimary --ondisk vda
+part /boot/efi --fstype vfat --size 512 --asprimary --ondisk vda
 reqpart
 part pv.01     --size=1    --ondisk=vda      --asprimary --grow
 volgroup rocky pv.01
diff --git a/Rocky-9-EC2.ks b/Rocky-9-EC2-Base.ks
similarity index 100%
rename from Rocky-9-EC2.ks
rename to Rocky-9-EC2-Base.ks
diff --git a/Rocky-9-EC2-LVM.ks b/Rocky-9-EC2-LVM.ks
index a05979b..2a6f8cd 100644
--- a/Rocky-9-EC2-LVM.ks
+++ b/Rocky-9-EC2-LVM.ks
@@ -17,6 +17,8 @@ rootpw --iscrypted thereisnopasswordanditslocked
 # Partition stuff - Should work for x86 and aarch64
 zerombr
 clearpart --all --initlabel 
+part /boot --fstype xfs --size 1024 --asprimary --ondisk vda
+part /boot/efi --fstype vfat --size 512 --asprimary --ondisk vda
 reqpart
 part pv.01     --size=1    --ondisk=vda      --asprimary --grow
 volgroup rocky pv.01
diff --git a/Rocky-9-GenericCloud.ks b/Rocky-9-GenericCloud-Base.ks
similarity index 100%
rename from Rocky-9-GenericCloud.ks
rename to Rocky-9-GenericCloud-Base.ks