diff --git a/JeOS.kiwi b/JeOS.kiwi
index 7d8c31c..c21db78 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -194,21 +194,18 @@
         <package name="dracut"/>
         <package name="fipscheck"/>
         <package name="group(mail)"/> <!-- needed by useradd bsc#1061838-->
-        <package name="group(wheel)"/>
-        <package name="grub2-branding-openSUSE" bootinclude="true"/>
         <package name="iputils"/>
         <package name="issue-generator"/> <!-- bsc#1084879 -->
-        <package name="vim"/>
+        <package name="vim-small"/>
         <package name="shim" arch="x86_64"/>
         <package name="grub2"/>
-        <package name="grub2-x86_64-efi" arch="x86_64"/>
         <package name="grub2-arm64-efi" arch="aarch64"/>
+        <package name="grub2-branding-openSUSE" bootinclude="true"/>
+        <package name="grub2-x86_64-efi" arch="x86_64"/>
         <package name="haveged"/>
         <package name="less" />
         <package name="tar"/>
         <package name="parted"/>
-        <package name="openSUSE-build-key"/>
-        <package name="systemd"/>
         <package name="systemd-sysvinit"/>
         <package name="timezone"/>
         <package name="wicked"/>
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 3479856..8f0ab07 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 18 08:16:29 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Drop some now redundant entries from the package list
+- Switch to vim-small, saves ~50MiB
+- Drop group(wheel), bug in cloud-init got fixed (boo#1080595)
+
 -------------------------------------------------------------------
 Mon Apr 27 08:07:31 UTC 2020 - Ludwig Nussel <lnussel@suse.de>