diff --git a/fedora-riscv64-gnome-rawhide.ks b/fedora-riscv64-gnome-rawhide.ks
index b07645a..bd28beb 100644
--- a/fedora-riscv64-gnome-rawhide.ks
+++ b/fedora-riscv64-gnome-rawhide.ks
@@ -12,13 +12,14 @@ network --bootproto dhcp --device=link --hostname=fedora-riscv
 rootpw riscv
 firewall --enabled --ssh
 timezone --utc America/New_York
-selinux --disabled
-services --enabled=sshd,NetworkManager,chronyd
+selinux --enforcing
+services --enabled=sshd,NetworkManager,chronyd,haveged --disabled=lm_sensors
 
-bootloader --location=none --disabled
+bootloader --location=none --extlinux
 
 zerombr
 clearpart --all --initlabel --disklabel=gpt
+part /boot --size=512 --fstype ext4 --asprimary
 part / --fstype="ext4" --size=7680
 
 # Halt the system once configuration has finished.
@@ -29,6 +30,9 @@ poweroff
 @buildsys-build
 @base-x
 @hardware-support
+@rpm-development-tools
+@c-development
+@development-tools
 @gnome-desktop
 
 kernel
@@ -38,10 +42,18 @@ kernel-modules
 kernel-modules-extra
 linux-firmware
 fedora-bbl
+fedora-bbl-nopayload
+opensbi-unstable
+opensbi-unstable-fedora
+opensbi-unstable-images-riscv64
+extlinux-bootloader
+uboot-tools
+uboot-images-riscv64
 
 openssh
 openssh-server
 glibc-langpack-en
+glibc-static
 lsof
 nano
 openrdate
@@ -124,34 +136,90 @@ tldr
 ncdu
 colordiff
 prettyping
-yum
 qemu-guest-agent
 iptables-services
 autoconf
+autoconf-archive
 automake
 gettext
 nnn
 gdb
 libtool
 texinfo
+policycoreutils
+policycoreutils-python-utils
+setools-console
+coreutils
+setroubleshoot-server
+audit
+selinux-policy
+selinux-policy-targeted
+execstack
+stress-ng
+python3-pyelftools
+inxi
 # Below packages are needed for creating disk images via koji-builder
 livecd-tools
 python-imgcreate-sysdeps
 python3-imgcreate
-python2-pyparted
 python3-pyparted
 isomd5sum
-python2-isomd5sum
 python3-isomd5sum
 pykickstart
-python2-kickstart
 python3-kickstart
-python2-ordered-set
 python3-ordered-set
 appliance-tools
 pycdio
 qemu-img
 # end of creating disk image packages list
+dosfstools
+btrfs-progs
+e2fsprogs
+f2fs-tools
+jfsutils
+mtd-utils
+ntfsprogs
+udftools
+xfsprogs
+kpartx
+libguestfs-tools-c
+rpkg
+binwalk
+bpftool
+kernel-tools
+perf
+python3-perf
+# Add gcc packages
+cpp
+gcc
+gcc-c++
+gcc-gdb-plugin
+gcc-gfortran
+gcc-go
+gcc-plugin-devel
+libatomic
+libatomic-static
+libgcc
+libgfortran
+libgfortran-static
+libgo
+libgo-devel
+libgo-static
+libgomp
+libstdc++
+libstdc++-devel
+libstdc++-static
+gcc-gdc
+libgphobos
+libgphobos-static
+pax-utils
+gcc-gnat
+libgnat
+libgnat-devel
+libgnat-static
+usbutils
+haveged
+# end of gcc packages
 # Add dejavu fonts
 dejavu-fonts-common
 dejavu-lgc-sans-fonts
@@ -161,11 +229,24 @@ dejavu-sans-fonts
 dejavu-sans-mono-fonts
 dejavu-serif-fonts
 # end of dejavu fonts
+
+-grubby
+grubby-deprecated
 %end
 
 %post
 # 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
+dnf config-manager --set-disabled rawhide updates updates-testing fedora fedora-modular fedora-cisco-openh264 updates-modular updates-testing-modular rawhide-modular
+
+# 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:
+# https://www.suse.com/support/kb/doc/?id=7018491
+# https://www.freedesktop.org/software/systemd/man/systemd.mount.html
+# https://github.com/systemd/systemd/issues/3446
+# We modify /etc/fstab to give more time for device detection (the problematic part)
+# and mounting processes. This should help on systems where boot takes longer.
+sed -i 's|noatime|noatime,x-systemd.device-timeout=300s,x-systemd.mount-timeout=300s|g' /etc/fstab
 
 # Create Fedora RISC-V repo
 cat << EOF > /etc/yum.repos.d/fedora-riscv.repo