diff --git a/components/boot-btrfsdisk.xml b/components/boot-btrfsdisk.xml
index 93db811..c137173 100644
--- a/components/boot-btrfsdisk.xml
+++ b/components/boot-btrfsdisk.xml
@@ -8,7 +8,7 @@
 		<type image="oem"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="x-systemd.growfs,compress=zstd:1"
 		      kernelcmdline="rhgb quiet" devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
+		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="200" firmware="uefi"
 		      rootfs_label="almalinux"
 		      >
 			<bootloader name="grub2" bls="true" console="console" timeout="5"/>
diff --git a/components/boot-xfsdisk.xml b/components/boot-xfsdisk.xml
index 3f3edbe..fc69e5f 100644
--- a/components/boot-xfsdisk.xml
+++ b/components/boot-xfsdisk.xml
@@ -8,7 +8,7 @@
 		<type image="oem"
 		      filesystem="xfs"
 		      kernelcmdline="rhgb quiet" devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="500" firmware="uefi"
+		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="200" firmware="uefi"
 		      rootfs_label="almalinux"
 		      >
 			<bootloader name="grub2" bls="true" console="console" timeout="5"/>
diff --git a/config.sh b/config.sh
index 754bf47..b2101a2 100755
--- a/config.sh
+++ b/config.sh
@@ -76,6 +76,18 @@ if [[ "$kiwi_profiles" == *"Cloud"* ]] || [[ "$kiwi_profiles" == *"WSL"* ]]; the
 	systemctl enable cloud-config.service cloud-final.service cloud-init.service cloud-init-local.service cloud-init.target
 fi
 
+if [[ "$kiwi_profiles" == *"Cloud"* ]]; then
+	## Enable tuned
+	systemctl enable tuned.service
+
+	## Enabled Xen Project PVHVM drivers only on x86_64
+	## https://bugzilla.redhat.com/show_bug.cgi?id=1849082#c7
+	if [[ "$(uname -m)" == "x86_64" ]]; then
+		echo 'add_drivers+="xen-netfront xen-blkfront"' >> /etc/dracut.conf.d/xen_pvhvm.conf
+		dracut -f --regenerate-all
+	fi
+fi
+
 if [[ "$kiwi_profiles" == *"Azure"* ]]; then
 	## Enable Azure service
 	systemctl enable waagent.service
diff --git a/platforms/cloud.xml b/platforms/cloud.xml
index d910acd..711a9d5 100644
--- a/platforms/cloud.xml
+++ b/platforms/cloud.xml
@@ -33,7 +33,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="almalinux"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -48,7 +48,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="almalinux"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -63,7 +63,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="almalinux"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -78,7 +78,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="almalinux"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -93,7 +93,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="almalinux"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -109,7 +109,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="almalinux"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -125,7 +125,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="almalinux"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -140,7 +140,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="almalinux"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
@@ -206,12 +206,30 @@
 		<ignore name="geolite2-city"/>
 		<ignore name="geolite2-country"/>
 		<ignore name="plymouth"/>
+		<ignore name="libblockdev"/>
+        <ignore name="volume_key-libs"/>
+		<ignore name="dracut-network"/>
+		<ignore name="dracut-squash"/>
+		<ignore name="flashrom"/>
+		<ignore name="nss*"/>
+		<ignore name="ntfs-*"/>
+		<ignore name="xkeyboard-config"/>
+		<ignore name="pcsc-*"/>
+		<ignore name="pinentry"/>
 		<!-- Decompose cloud-server-environment since the group doesn't exist in RHEL -->
 		<namedCollection name="standard"/>
 		<package name="cloud-init"/>
 		<package name="cloud-utils-growpart"/>
 		<package name="dracut-config-generic"/>
 		<package name="glibc-langpack-en"/>
+		<package name="virt-what"/>
+		<package name="tuned"/>
+		<package name="tar"/>
+		<package name="tcpdump"/>
+		<package name="rsync"/>
+		<package name="quota"/>
+		<package name="nfs-utils"/>
+		<package name="hdparm"/>
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="Cloud-Base-AmazonEC2">
 		<package name="awscli2"/>
diff --git a/platforms/vagrant.xml b/platforms/vagrant.xml
index 4033e9f..d6b2ee1 100644
--- a/platforms/vagrant.xml
+++ b/platforms/vagrant.xml
@@ -15,7 +15,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="centos"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
@@ -31,7 +31,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="centos"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
@@ -47,7 +47,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="centos"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
@@ -64,7 +64,7 @@
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8"
 		      devicepersistency="by-uuid"
-		      bootpartition="false" efipartsize="500" firmware="uefi"
+		      bootpartition="false" efipartsize="200" firmware="uefi"
 		      rootfs_label="centos"
 		      >
 			<bootloader name="grub2" bls="true" console="serial" timeout="1"/>