diff --git a/JeOS.kiwi b/JeOS.kiwi
index 309b2fc..3ab232f 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -29,7 +29,7 @@
             bootloader="grub2"
             firmware="uefi"
             efipartsize="33"
-            kernelcmdline="quiet systemd.show_status=1 console=ttyS0,115200 console=tty0"
+            kernelcmdline="rw quiet systemd.show_status=1 console=ttyS0,115200 console=tty0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -62,7 +62,7 @@
             bootloader="grub2"
             firmware="uefi"
             efipartsize="33"
-            kernelcmdline="quiet systemd.show_status=1 console=ttyS0,115200 console=tty0"
+            kernelcmdline="rw quiet systemd.show_status=1 console=ttyS0,115200 console=tty0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -94,7 +94,7 @@
             bootloader="grub2"
             firmware="uefi"
             efipartsize="33"
-            kernelcmdline="quiet systemd.show_status=1 console=ttyS0,115200 console=tty0"
+            kernelcmdline="rw quiet systemd.show_status=1 console=ttyS0,115200 console=tty0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -129,7 +129,7 @@
             bootloader="grub2"
             firmware="uefi"
             efipartsize="33"
-            kernelcmdline="quiet systemd.show_status=1 console=ttyS0,115200 console=tty0 net.ifnames=0"
+            kernelcmdline="rw quiet systemd.show_status=1 console=ttyS0,115200 console=tty0 net.ifnames=0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -151,7 +151,7 @@
             bootloader="grub2"
             firmware="uefi"
             efipartsize="33"
-            kernelcmdline="quiet systemd.show_status=1 rootdelay=300 console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200"
+            kernelcmdline="rw quiet systemd.show_status=1 rootdelay=300 console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -185,7 +185,7 @@
             bootloader="grub2"
             firmware="uefi"
             efipartsize="33"
-            kernelcmdline="quiet systemd.show_status=1 rootdelay=300 console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200"
+            kernelcmdline="rw quiet systemd.show_status=1 rootdelay=300 console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -218,7 +218,7 @@
             fsmountoptions="noatime,compress=lzo"
             bootloader="grub2"
             firmware="efi"
-            kernelcmdline="quiet systemd.show_status=1 console=ttyS0,115200 console=tty"
+            kernelcmdline="rw quiet systemd.show_status=1 console=ttyS0,115200 console=tty"
             bootpartition="false"
             devicepersistency="by-uuid"
             btrfs_quota_groups="true"
diff --git a/config.sh b/config.sh
index 53fb253..7e20da1 100644
--- a/config.sh
+++ b/config.sh
@@ -42,7 +42,8 @@ echo FONT="eurlatgr.psfu" >> /etc/vconsole.conf
 # prepare for setting root pw, timezone
 #--------------------------------------
 echo "** reset machine settings"
-rm -f /var/lib/zypp/AnonymousUniqueId \
+rm -f /etc/machine-id \
+      /var/lib/zypp/AnonymousUniqueId \
       /var/lib/systemd/random-seed
 
 #======================================
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 48ae612..d98b322 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,7 +1,14 @@
+-------------------------------------------------------------------
+Tue Jan 18 15:23:14 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Delete /etc/machine-id, necessary for ConditionFirstBoot
+- Add rw to the default boot options to fix /etc/machine-id setup
+  (bsc#1194484, see also gh#OSInside/kiwi#1650)
+
 -------------------------------------------------------------------
 Tue Nov 16 13:07:23 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 
-- Install AppArmor pattern and audit
+- Install AppArmor pattern and audit (jsc#SLE-22705)
 
 -------------------------------------------------------------------
 Fri Nov 12 08:29:40 UTC 2021 - Fabian Vogt <fvogt@suse.com>
diff --git a/kiwi-templates-JeOS.spec b/kiwi-templates-JeOS.spec
index de224cd..00e63c7 100644
--- a/kiwi-templates-JeOS.spec
+++ b/kiwi-templates-JeOS.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kiwi-templates-JeOS
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed