diff --git a/teams/eln/cloud.xml b/teams/eln/cloud.xml
index 090b7b5..2c71043 100644
--- a/teams/eln/cloud.xml
+++ b/teams/eln/cloud.xml
@@ -28,7 +28,7 @@
 			<requires profile="Cloud-Base-Generic"/>
 		</profile>
 	</profiles>
-	<preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64">
+	<preferences profiles="Cloud-Base-Azure" arch="x86_64">
 		<type image="oem" format="vhd-fixed" formatoptions="force_size"
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off"
@@ -43,7 +43,22 @@
 			</oemconfig>
 		</type>
 	</preferences>
-	<preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64">
+	<preferences profiles="Cloud-Base-Azure" arch="aarch64">
+		<type image="oem" format="vhd-fixed" formatoptions="force_size"
+		      filesystem="xfs"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off"
+		      devicepersistency="by-uuid"
+		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+		      rootfs_label="fedora"
+		      >
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
+			<size unit="G">5</size>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64">
 		<type image="oem"
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
@@ -58,7 +73,22 @@
 			</oemconfig>
 		</type>
 	</preferences>
-	<preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64">
+	<preferences profiles="Cloud-Base-AmazonEC2" arch="aarch64">
+		<type image="oem"
+		      filesystem="xfs"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
+		      devicepersistency="by-uuid"
+		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+		      rootfs_label="fedora"
+		      >
+			<bootloader name="grub2" bls="true" timeout="0"/>
+			<size unit="G">5</size>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="Cloud-Base-GCE" arch="x86_64">
 		<type image="oem" format="gce"
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off"
@@ -74,7 +104,23 @@
 			</oemconfig>
 		</type>
 	</preferences>
-	<preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64">
+	<preferences profiles="Cloud-Base-GCE" arch="aarch64">
+		<type image="oem" format="gce"
+		      filesystem="xfs"
+		      kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off"
+		      devicepersistency="by-uuid"
+		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+		      rootfs_label="fedora"
+		      >
+			<bootloader name="grub2" bls="true" timeout="0"/>
+			<!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G -->
+			<size unit="G">10</size>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
+	<preferences profiles="Cloud-Base-Generic" arch="x86_64">
 		<type image="oem" format="qcow2"
 		      filesystem="xfs"
 		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
@@ -89,6 +135,21 @@
 			</oemconfig>
 		</type>
 	</preferences>
+	<preferences profiles="Cloud-Base-Generic" arch="aarch64">
+		<type image="oem" format="qcow2"
+		      filesystem="xfs"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
+		      devicepersistency="by-uuid"
+		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
+		      rootfs_label="fedora"
+		      >
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
+			<size unit="G">5</size>
+			<oemconfig>
+				<oem-resize>false</oem-resize>
+			</oemconfig>
+		</type>
+	</preferences>
 	<preferences profiles="Cloud-Base-Generic" arch="ppc64le">
 		<type image="oem" format="qcow2"
 		      filesystem="xfs"