diff --git a/fedora-riscv64-developer-rawhide.ks b/fedora-riscv64-developer-rawhide.ks
index ee8a682..9026d2a 100644
--- a/fedora-riscv64-developer-rawhide.ks
+++ b/fedora-riscv64-developer-rawhide.ks
@@ -47,6 +47,9 @@ extlinux-bootloader
 uboot-tools
 uboot-images-riscv64
 freedom-u540-c000-bootloader
+# Remove this in %post
+dracut-config-generic
+-dracut-config-rescue
 
 openssh
 openssh-server
@@ -232,10 +235,13 @@ dejavu-serif-fonts
 -grubby
 grubby-deprecated
 
-# no longer in @core since 2018-10, but needed for livesys script
+# No longer in @core since 2018-10, but needed for livesys script
 initscripts
 chkconfig
 
+# Lets resize / on first boot
+#dracut-modules-growroot
+
 dnscrypt-proxy
 meson
 cloud-utils-growpart
@@ -303,6 +309,8 @@ zlib-static
 # Disable default repositories (not riscv64 in upstream)
 dnf config-manager --set-disabled rawhide updates updates-testing fedora fedora-modular fedora-cisco-openh264 updates-modular updates-testing-modular rawhide-modular
 
+dnf -y remove dracut-config-generic
+
 # systemd on no-SMP boots (i.e. single core) sometimes timeout waiting for storage
 # devices. After entering emergency prompt all disk are mounted.
 # For more information see:
@@ -399,7 +407,7 @@ To upgrade disk image use 'dnf upgrade --best'
 If DNS isn’t working, try editing ‘/etc/yum.repos.d/fedora-riscv.repo’.
 
 For updates and latest information read:
-https://fedorapeople.org/groups/risc-v/disk-images/readme.txt
+https://fedoraproject.org/wiki/Architectures/RISC-V
 
 Fedora/RISC-V
 -------------
@@ -408,6 +416,14 @@ SCM:                http://fedora.riscv.rocks:3000/
 Distribution rep.:  http://fedora.riscv.rocks/repos-dist/
 Koji internal rep.: http://fedora.riscv.rocks/repos/
 EOF
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
+
+# remove random seed, the newly installed instance should make it's own
+rm -f /var/lib/systemd/random-seed
+
 %end
 
 # EOF