diff --git a/JeOS.kiwi b/JeOS.kiwi
index 76a7e9b..b59f2ea 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -37,7 +37,6 @@
             <systemdisk>
                 <volume name="home"/>
                 <volume name="root"/>
-                <volume name="tmp"/>
                 <volume name="opt"/>
                 <volume name="srv"/>
                 <volume name="boot/grub2/i386-pc"/>
@@ -71,7 +70,6 @@
             <systemdisk>
                 <volume name="home"/>
                 <volume name="root"/>
-                <volume name="tmp"/>
                 <volume name="opt"/>
                 <volume name="srv"/>
                 <volume name="boot/grub2/i386-pc"/>
@@ -129,7 +127,6 @@
             <systemdisk>
                 <volume name="home"/>
                 <volume name="root"/>
-                <volume name="tmp"/>
                 <volume name="opt"/>
                 <volume name="srv"/>
                 <volume name="boot/grub2/i386-pc"/>
@@ -164,7 +161,6 @@
             <systemdisk>
                 <volume name="home"/>
                 <volume name="root"/>
-                <volume name="tmp"/>
                 <volume name="opt"/>
                 <volume name="srv"/>
                 <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
@@ -214,6 +210,7 @@
         <package name="live-add-yast-repos"/>
         <!-- <package name="rsyslog"/> for SLE -->
         <package name="systemd-logger"/> <!-- for openSUSE -->
+        <package name="zypper-needs-restarting"/> <!-- Some deployment script use this (bsc#1173548) -->
     </packages>
 
     <!-- Not needed in OpenStack as it uses XFS and cloud-init -->
diff --git a/config.sh b/config.sh
index 3c45f87..22b8130 100644
--- a/config.sh
+++ b/config.sh
@@ -126,14 +126,6 @@ sed -i 's/.*solver.onlyRequires.*/solver.onlyRequires = true/g' /etc/zypp/zypp.c
 #--------------------------------------
 sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g' /etc/zypp/zypp.conf
 
-#======================================
-# Configure Raspberry Pi specifics
-#--------------------------------------
-if [[ "$kiwi_profiles" == *"RaspberryPi"* ]]; then
-        # Also show WLAN interfaces in /etc/issue. Remove once https://github.com/thkukuk/issue-generator/pull/4 accepted
-        baseUpdateSysConfig /etc/sysconfig/issue-generator NETWORK_INTERFACE_REGEX '^[bew]'
-fi
-
 # Not compatible with set -e
 baseCleanMount || true
 
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 82f017c..5644d2a 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Aug 28 07:27:05 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Drop the tmp subvolume (boo#1173461, jsc#PM-1898)
+
+-------------------------------------------------------------------
+Thu Aug 27 11:19:26 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- issue-generator got fixed, so drop the workaround for RPi
+
+-------------------------------------------------------------------
+Thu Aug 27 10:28:32 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Add zypper-needs-restarting (bsc#1173548)
+
 -------------------------------------------------------------------
 Mon Jul 13 07:04:18 UTC 2020 - Fabian Vogt <fvogt@suse.com>