diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
index 33f11a4..3a99ce7 100644
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@@ -33,12 +33,13 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+		      bootpartition="false" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>
@@ -53,12 +54,13 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+		      bootpartition="false" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" console="serial" timeout="0"/>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>
@@ -73,13 +75,14 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+		      bootpartition="false" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" bls="true" timeout="0"/>
 			<size unit="G">5</size>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>
@@ -93,13 +96,14 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+		      bootpartition="false" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" bls="true" timeout="0"/>
 			<size unit="G">5</size>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>
@@ -113,7 +117,7 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+		      bootpartition="false" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" bls="true" timeout="0"/>
@@ -121,6 +125,7 @@
 			<size unit="G">10</size>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>
@@ -134,7 +139,7 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+		      bootpartition="false" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" bls="true" timeout="0"/>
@@ -142,6 +147,7 @@
 			<size unit="G">10</size>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>
@@ -155,13 +161,14 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+		      bootpartition="false" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">5</size>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>
@@ -175,13 +182,14 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+		      bootpartition="false" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">5</size>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>
@@ -195,13 +203,14 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" firmware="ofw"
+		      bootpartition="false" firmware="ofw"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">5</size>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>
diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml
index 8a9383b..301b08c 100644
--- a/teams/cloud/vagrant.xml
+++ b/teams/cloud/vagrant.xml
@@ -15,7 +15,7 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+		      bootpartition="false" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
@@ -23,6 +23,7 @@
 			<vagrantconfig provider="libvirt" virtualsize="5"/>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>
@@ -36,7 +37,7 @@
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
 		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+		      bootpartition="false" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
@@ -44,6 +45,7 @@
 			<vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="5"/>
 			<systemdisk>
 				<volume name="@root=root"/>
+				<volume name="boot" parent="/"/>
 				<volume name="home" parent="/"/>
 				<volume name="var" parent="/"/>
 			</systemdisk>