diff --git a/kiwi/bootloader/config/grub2.py b/kiwi/bootloader/config/grub2.py
index c5ed92cc..b7fabc7a 100644
--- a/kiwi/bootloader/config/grub2.py
+++ b/kiwi/bootloader/config/grub2.py
@@ -555,8 +555,10 @@ class BootLoaderConfigGrub2(BootLoaderConfigBase):
             if os.path.exists(os.sep.join([self.root_dir, theme_background])):
                 grub_default_entries['GRUB_BACKGROUND'] = theme_background
         if self.firmware.efi_mode():
-            grub_default_entries['GRUB_USE_LINUXEFI'] = 'true'
-            grub_default_entries['GRUB_USE_INITRDEFI'] = 'true'
+            # linuxefi/initrdefi only exist on x86, others always use efi
+            if self.arch == 'ix86' or self.arch == 'x86_64':
+                grub_default_entries['GRUB_USE_LINUXEFI'] = 'true'
+                grub_default_entries['GRUB_USE_INITRDEFI'] = 'true'
         if self.xml_state.build_type.get_btrfs_root_is_snapshot():
             grub_default_entries['SUSE_BTRFS_SNAPSHOT_BOOTING'] = 'true'