diff --git a/JeOS.kiwi b/JeOS.kiwi
index 61cfde8..579f833 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -261,7 +261,6 @@
         <package name="iputils"/>
         <package name="issue-generator"/> <!-- bsc#1084879 -->
         <package name="vim-small"/>
-        <package name="shim" arch="x86_64"/>
         <package name="grub2"/>
         <package name="grub2-arm64-efi" arch="aarch64"/>
         <package name="grub2-branding-openSUSE" bootinclude="true"/>
@@ -301,6 +300,11 @@
         <package name="firewalld"/>
     </packages>
 
+    <!-- Shim for secure boot everywhere except for RPi -->
+    <packages type="image" profiles="kvm-and-xen,VMware,MS-HyperV,OpenStack-Cloud">
+        <package name="shim" arch="aarch64,x86_64"/>
+    </packages>
+
     <packages type="image" profiles="kvm-and-xen">
         <package name="xen-tools-domU"/>
         <package name="xen-libs"/>
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 56ed395..5695460 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr  7 13:19:01 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- Install shim everywhere except on RPi (bsc#1182211)
+
 -------------------------------------------------------------------
 Tue Mar  9 15:44:50 UTC 2021 - Fabian Vogt <fvogt@suse.com>