diff --git a/fedora-riscv64-developer-f38.ks b/fedora-riscv64-developer-f38.ks
index 52e393b..c534c61 100644
--- a/fedora-riscv64-developer-f38.ks
+++ b/fedora-riscv64-developer-f38.ks
@@ -86,11 +86,16 @@ extra-cmake-modules
 elfutils
 gdisk
 util-linux
-gparted
 parted
 fpaste
 vim-common
 hexedit
+xxd
+hexyl
+poke
+poke-devel
+poke-vim
+poke-emacs
 koji-builder
 mc
 evemu
@@ -98,12 +103,13 @@ lftp
 mtr
 traceroute
 wget
+curl
 aria2
 incron
 emacs
 vim
 neofetch
-bash-completion
+#bash-completion
 zsh
 tcsh
 nvme-cli
@@ -115,22 +121,14 @@ bison
 elfutils-devel
 flex
 m4
+man-db
 net-tools
 openssl-devel
 perl-devel
 perl-generators
 pesign
-xterm
-fluxbox
 elinks
 lynx
-awesome
-midori
-dillo
-epiphany
-i3
-sway
-pcmanfm
 entr
 cowsay
 ack
@@ -214,23 +212,16 @@ 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
@@ -239,15 +230,6 @@ libgnat-static
 usbutils
 haveged
 # end of gcc packages
-# Add dejavu fonts
-dejavu-fonts-all
-dejavu-lgc-sans-fonts
-dejavu-lgc-sans-mono-fonts
-dejavu-lgc-serif-fonts
-dejavu-sans-fonts
-dejavu-sans-mono-fonts
-dejavu-serif-fonts
-# end of dejavu fonts
 watchdog
 
 -grubby
@@ -348,8 +330,24 @@ glib-devel
 glib2-devel
 json-c-devel
 libbsd-devel
+libxcb-devel
 zlib-devel
+xxhash-devel
 xz-devel
+mpfr-devel
+libmd-devel
+libjpeg-devel
+libglvnd-devel
+libglvnd-core-devel
+libgcrypt-devel
+libgbm-devel
+kmod-devel
+keyutils-libs-devel
+Judy-devel
+eigen3-devel
+libaio-devel
+xorg-x11-proto
+lksctp-tools-devel
 brotli-devel
 libuv-devel
 libnghttp2-devel
@@ -361,6 +359,7 @@ libXrender-devel
 libXrandr-devel
 libXi-devel
 libXext-devel
+libXau-devel
 cups-devel
 fontconfig-devel
 alsa-lib-devel
@@ -373,6 +372,10 @@ python3-rpmautospec
 rpmautospec
 rpmautospec-rpm-macros
 koji-builder-plugins
+
+golang
+rust
+cargo
 %end
 
 %post
@@ -409,6 +412,7 @@ cat > /etc/rc.d/init.d/livesys << EOF
 useradd -c "Fedora RISCV User" riscv
 echo fedora_rocks! | passwd --stdin riscv > /dev/null
 usermod -aG wheel riscv > /dev/null
+usermod -aG mock riscv > /dev/null
 
 exit 0
 EOF
@@ -457,6 +461,10 @@ EOF
 # only problem is they are the same serial console.  Mask one.
 systemctl mask serial-getty@hvc0.service
 
+# Disable tmpfs for /tmp
+# Most boards don't have a lot of RAM.
+systemctl mask tmp.mount
+
 # setup login message
 cat << EOF | tee /etc/issue /etc/issue.net
 Welcome to the Fedora/RISC-V disk image
@@ -468,7 +476,8 @@ Kernel \r on an \m (\l)
 
 The root password is 'fedora_rocks!'.
 root password logins are disabled in SSH starting Fedora 31.
-User 'riscv' with password 'fedora_rocks!' in 'wheel' group is provided.
+User 'riscv' with password 'fedora_rocks!' in 'wheel' and 'mock' groups 
+is provided.
 
 To install new packages use 'dnf install ...'
 
@@ -497,8 +506,11 @@ rm -f /var/lib/systemd/random-seed
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 
-# The enp1s0 interface is a left over from the imagefactory install, clean this up
-rm -f /etc/NetworkManager/system-connections/*.nmconnection
+# go ahead and pre-make the man -k cache (#455968)
+/usr/bin/mandb
+
+# make sure there aren't core files lying around
+rm -f /core*
 
 releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary