diff --git a/config.sh b/config.sh
index ff7d1fe..b08a0c4 100644
--- a/config.sh
+++ b/config.sh
@@ -14,7 +14,7 @@
 test -f /.kconfig && . /.kconfig
 test -f /.profile && . /.profile
 
-set -euox pipefail
+set -euxo pipefail
 
 exec | tee /var/log/config.log
 exec 2>&1
diff --git a/list-common.sh b/list-common.sh
index c1a1677..9f3f948 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -51,7 +51,7 @@ buildignore inxi
 buildignore sane-backends
 
 install branding-openSUSE
-install gfxboot
+install gfxboot  i686,x86_64
 
 # Don't pull in any -32bit libs
 buildignore glibc-32bit
@@ -224,7 +224,7 @@ install jfsutils
 install libatm1
 install lsb-release
 install lvm2
-install memtest86+
+install memtest86+ i686,x86_64
 install mpt-firmware
 install nano
 install ntfs-3g
@@ -235,7 +235,7 @@ install quota
 install reiserfs
 install rsync
 install smartmontools
-install smbios-utils-python
+install smbios-utils-python  i686,x86_64
 install util-linux
 install wireless-regdb
 install wpa_supplicant
@@ -255,14 +255,14 @@ install xf86-video-nv
 install xf86-video-qxl
 install xf86-video-r128
 install xf86-video-savage
-install xf86-video-siliconmotion
+install xf86-video-siliconmotion i686,x86_64
 install xf86-video-sis
 install xf86-video-sisusb
 install xf86-video-tdfx
 install xf86-video-tga
 install xf86-video-v4l
 install xf86-video-vesa
-install xf86-video-vmware
+install xf86-video-vmware i686,x86_64
 install xf86-video-voodoo
 install xfsdump
 install xfsprogs
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index a72d5cf..b61ad50 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Leap-15.1-GNOME-Live" displayname="openSUSE Leap 15.1 GNOME Live">
   <description type="system">
     <author>openSUSE Project</author>
@@ -7,7 +10,7 @@
   </description>
   <profiles>
     <profile name="noEFI" description="no EFI for x86" import="true" arch="i686"/>
-    <profile name="EFI" description="EFI for x86_64" import="true" arch="x86_64"/>
+    <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_GNOME_Live" mediacheck="true"/>
@@ -34,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -47,7 +50,8 @@
     <package name="patch"/>
     <package name="zypper"/>
     <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="memtest86+"/>
+    <package name="grub2-arm64-efi" arch="aarch64"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
     <archive name="livecd-udev.tar.xz"/>
@@ -152,7 +156,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot"/>
+    <package name="gfxboot" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
@@ -339,7 +343,7 @@
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
-    <package name="memtest86+"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
     <package name="ntfs-3g"/>
@@ -350,7 +354,7 @@
     <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
-    <package name="smbios-utils-python"/>
+    <package name="smbios-utils-python" arch="i686,x86_64"/>
     <package name="util-linux"/>
     <package name="wireless-regdb"/>
     <package name="wpa_supplicant"/>
@@ -370,14 +374,14 @@
     <package name="xf86-video-qxl"/>
     <package name="xf86-video-r128"/>
     <package name="xf86-video-savage"/>
-    <package name="xf86-video-siliconmotion"/>
+    <package name="xf86-video-siliconmotion" arch="i686,x86_64"/>
     <package name="xf86-video-sis"/>
     <package name="xf86-video-sisusb"/>
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 1e3b8c8..85c8ddf 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Leap-15.1-KDE-Live" displayname="openSUSE Leap 15.1 KDE Live">
   <description type="system">
     <author>openSUSE Project</author>
@@ -7,7 +10,7 @@
   </description>
   <profiles>
     <profile name="noEFI" description="no EFI for x86" import="true" arch="i686"/>
-    <profile name="EFI" description="EFI for x86_64" import="true" arch="x86_64"/>
+    <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_KDE_Live" mediacheck="true"/>
@@ -34,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -47,7 +50,8 @@
     <package name="patch"/>
     <package name="zypper"/>
     <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="memtest86+"/>
+    <package name="grub2-arm64-efi" arch="aarch64"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
     <archive name="livecd-udev.tar.xz"/>
@@ -152,7 +156,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot"/>
+    <package name="gfxboot" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
@@ -339,7 +343,7 @@
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
-    <package name="memtest86+"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
     <package name="ntfs-3g"/>
@@ -350,7 +354,7 @@
     <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
-    <package name="smbios-utils-python"/>
+    <package name="smbios-utils-python" arch="i686,x86_64"/>
     <package name="util-linux"/>
     <package name="wireless-regdb"/>
     <package name="wpa_supplicant"/>
@@ -370,14 +374,14 @@
     <package name="xf86-video-qxl"/>
     <package name="xf86-video-r128"/>
     <package name="xf86-video-savage"/>
-    <package name="xf86-video-siliconmotion"/>
+    <package name="xf86-video-siliconmotion" arch="i686,x86_64"/>
     <package name="xf86-video-sis"/>
     <package name="xf86-video-sisusb"/>
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 16f4b7e..9ae6d55 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Leap-15.1-Rescue-CD" displayname="openSUSE Leap 15.1 Rescue CD">
   <description type="system">
     <author>openSUSE Project</author>
@@ -7,7 +10,7 @@
   </description>
   <profiles>
     <profile name="noEFI" description="no EFI for x86" import="true" arch="i686"/>
-    <profile name="EFI" description="EFI for x86_64" import="true" arch="x86_64"/>
+    <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_Rescue_CD" mediacheck="true"/>
@@ -34,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -47,7 +50,8 @@
     <package name="patch"/>
     <package name="zypper"/>
     <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="memtest86+"/>
+    <package name="grub2-arm64-efi" arch="aarch64"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
     <archive name="livecd-udev.tar.xz"/>
@@ -152,7 +156,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot"/>
+    <package name="gfxboot" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
@@ -339,7 +343,7 @@
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
-    <package name="memtest86+"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
     <package name="ntfs-3g"/>
@@ -350,7 +354,7 @@
     <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
-    <package name="smbios-utils-python"/>
+    <package name="smbios-utils-python" arch="i686,x86_64"/>
     <package name="util-linux"/>
     <package name="wireless-regdb"/>
     <package name="wpa_supplicant"/>
@@ -370,14 +374,14 @@
     <package name="xf86-video-qxl"/>
     <package name="xf86-video-r128"/>
     <package name="xf86-video-savage"/>
-    <package name="xf86-video-siliconmotion"/>
+    <package name="xf86-video-siliconmotion" arch="i686,x86_64"/>
     <package name="xf86-video-sis"/>
     <package name="xf86-video-sisusb"/>
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 2555fc6..8e39cb4 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jun  7 11:20:37 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Move OBS comment
+- Use set in config.sh correctly
+
+-------------------------------------------------------------------
+Fri Jun  7 07:39:29 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Handle aarch64
+
 -------------------------------------------------------------------
 Sat May  4 11:15:35 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 5ab074e..f3f1289 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Tumbleweed-GNOME-Live" displayname="openSUSE Tumbleweed GNOME Live">
   <description type="system">
     <author>openSUSE Project</author>
@@ -7,7 +10,7 @@
   </description>
   <profiles>
     <profile name="noEFI" description="no EFI for x86" import="true" arch="i686"/>
-    <profile name="EFI" description="EFI for x86_64" import="true" arch="x86_64"/>
+    <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_GNOME_Live" mediacheck="true"/>
@@ -34,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -47,7 +50,8 @@
     <package name="patch"/>
     <package name="zypper"/>
     <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="memtest86+"/>
+    <package name="grub2-arm64-efi" arch="aarch64"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
     <archive name="livecd-udev.tar.xz"/>
@@ -152,7 +156,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot"/>
+    <package name="gfxboot" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
@@ -339,7 +343,7 @@
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
-    <package name="memtest86+"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
     <package name="ntfs-3g"/>
@@ -350,7 +354,7 @@
     <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
-    <package name="smbios-utils-python"/>
+    <package name="smbios-utils-python" arch="i686,x86_64"/>
     <package name="util-linux"/>
     <package name="wireless-regdb"/>
     <package name="wpa_supplicant"/>
@@ -370,14 +374,14 @@
     <package name="xf86-video-qxl"/>
     <package name="xf86-video-r128"/>
     <package name="xf86-video-savage"/>
-    <package name="xf86-video-siliconmotion"/>
+    <package name="xf86-video-siliconmotion" arch="i686,x86_64"/>
     <package name="xf86-video-sis"/>
     <package name="xf86-video-sisusb"/>
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 0dce46d..f2445f7 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Tumbleweed-KDE-Live" displayname="openSUSE Tumbleweed KDE Live">
   <description type="system">
     <author>openSUSE Project</author>
@@ -7,7 +10,7 @@
   </description>
   <profiles>
     <profile name="noEFI" description="no EFI for x86" import="true" arch="i686"/>
-    <profile name="EFI" description="EFI for x86_64" import="true" arch="x86_64"/>
+    <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_KDE_Live" mediacheck="true"/>
@@ -34,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -47,7 +50,8 @@
     <package name="patch"/>
     <package name="zypper"/>
     <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="memtest86+"/>
+    <package name="grub2-arm64-efi" arch="aarch64"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
     <archive name="livecd-udev.tar.xz"/>
@@ -152,7 +156,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot"/>
+    <package name="gfxboot" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
@@ -339,7 +343,7 @@
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
-    <package name="memtest86+"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
     <package name="ntfs-3g"/>
@@ -350,7 +354,7 @@
     <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
-    <package name="smbios-utils-python"/>
+    <package name="smbios-utils-python" arch="i686,x86_64"/>
     <package name="util-linux"/>
     <package name="wireless-regdb"/>
     <package name="wpa_supplicant"/>
@@ -370,14 +374,14 @@
     <package name="xf86-video-qxl"/>
     <package name="xf86-video-r128"/>
     <package name="xf86-video-savage"/>
-    <package name="xf86-video-siliconmotion"/>
+    <package name="xf86-video-siliconmotion" arch="i686,x86_64"/>
     <package name="xf86-video-sis"/>
     <package name="xf86-video-sisusb"/>
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 00f26f7..381d712 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Tumbleweed-Rescue-CD" displayname="openSUSE Tumbleweed Rescue CD">
   <description type="system">
     <author>openSUSE Project</author>
@@ -7,7 +10,7 @@
   </description>
   <profiles>
     <profile name="noEFI" description="no EFI for x86" import="true" arch="i686"/>
-    <profile name="EFI" description="EFI for x86_64" import="true" arch="x86_64"/>
+    <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_Rescue_CD" mediacheck="true"/>
@@ -34,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -47,7 +50,8 @@
     <package name="patch"/>
     <package name="zypper"/>
     <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="memtest86+"/>
+    <package name="grub2-arm64-efi" arch="aarch64"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
     <archive name="livecd-udev.tar.xz"/>
@@ -152,7 +156,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot"/>
+    <package name="gfxboot" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
@@ -339,7 +343,7 @@
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
-    <package name="memtest86+"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
     <package name="ntfs-3g"/>
@@ -350,7 +354,7 @@
     <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
-    <package name="smbios-utils-python"/>
+    <package name="smbios-utils-python" arch="i686,x86_64"/>
     <package name="util-linux"/>
     <package name="wireless-regdb"/>
     <package name="wpa_supplicant"/>
@@ -370,14 +374,14 @@
     <package name="xf86-video-qxl"/>
     <package name="xf86-video-r128"/>
     <package name="xf86-video-savage"/>
-    <package name="xf86-video-siliconmotion"/>
+    <package name="xf86-video-siliconmotion" arch="i686,x86_64"/>
     <package name="xf86-video-sis"/>
     <package name="xf86-video-sisusb"/>
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index a1c41d5..d232c6a 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="openSUSE-Tumbleweed-XFCE-Live" displayname="openSUSE Tumbleweed XFCE Live">
   <description type="system">
     <author>openSUSE Project</author>
@@ -7,7 +10,7 @@
   </description>
   <profiles>
     <profile name="noEFI" description="no EFI for x86" import="true" arch="i686"/>
-    <profile name="EFI" description="EFI for x86_64" import="true" arch="x86_64"/>
+    <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_XFCE_Live" mediacheck="true"/>
@@ -34,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -47,7 +50,8 @@
     <package name="patch"/>
     <package name="zypper"/>
     <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="memtest86+"/>
+    <package name="grub2-arm64-efi" arch="aarch64"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
     <archive name="livecd-udev.tar.xz"/>
@@ -152,7 +156,7 @@
     <package name="aaa_base" replaces="sane-backends"/>
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="gfxboot"/>
+    <package name="gfxboot" arch="i686,x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
@@ -339,7 +343,7 @@
     <package name="libatm1"/>
     <package name="lsb-release"/>
     <package name="lvm2"/>
-    <package name="memtest86+"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
     <package name="ntfs-3g"/>
@@ -350,7 +354,7 @@
     <package name="reiserfs"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
-    <package name="smbios-utils-python"/>
+    <package name="smbios-utils-python" arch="i686,x86_64"/>
     <package name="util-linux"/>
     <package name="wireless-regdb"/>
     <package name="wpa_supplicant"/>
@@ -370,14 +374,14 @@
     <package name="xf86-video-qxl"/>
     <package name="xf86-video-r128"/>
     <package name="xf86-video-savage"/>
-    <package name="xf86-video-siliconmotion"/>
+    <package name="xf86-video-siliconmotion" arch="i686,x86_64"/>
     <package name="xf86-video-sis"/>
     <package name="xf86-video-sisusb"/>
     <package name="xf86-video-tdfx"/>
     <package name="xf86-video-tga"/>
     <package name="xf86-video-v4l"/>
     <package name="xf86-video-vesa"/>
-    <package name="xf86-video-vmware"/>
+    <package name="xf86-video-vmware" arch="i686,x86_64"/>
     <package name="xf86-video-voodoo"/>
     <package name="xfsdump"/>
     <package name="xfsprogs"/>
diff --git a/livecd.kiwi.in b/livecd.kiwi.in
index e502a45..1725f1d 100644
--- a/livecd.kiwi.in
+++ b/livecd.kiwi.in
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+
+<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
+
 <image schemaversion="6.5" name="@NAME@" displayname="@DISPLAYNAME@">
   <description type="system">
     <author>openSUSE Project</author>
@@ -7,7 +10,7 @@
   </description>
   <profiles>
     <profile name="noEFI" description="no EFI for x86" import="true" arch="i686"/>
-    <profile name="EFI" description="EFI for x86_64" import="true" arch="x86_64"/>
+    <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="@VOLID@" mediacheck="true"/>
@@ -34,7 +37,7 @@
   </users>
   <packages type="image" patternType="plusRecommended">
     <package name="kernel-default"/>
-    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/>
+    <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true" arch="i686,x86_64"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
     <package name="dracut-kiwi-live"/>
     <!-- workaround for bnc#892087 -->
@@ -47,7 +50,8 @@
     <package name="patch"/>
     <package name="zypper"/>
     <package name="grub2-x86_64-efi" arch="x86_64"/>
-    <package name="memtest86+"/>
+    <package name="grub2-arm64-efi" arch="aarch64"/>
+    <package name="memtest86+" arch="i686,x86_64"/>
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
     <archive name="livecd-udev.tar.xz"/>