diff --git a/Rocky-9-KDE.ks b/Rocky-9-KDE.ks
index 2c64e40..d5b57cf 100644
--- a/Rocky-9-KDE.ks
+++ b/Rocky-9-KDE.ks
@@ -1,4 +1,4 @@
-# Generated by pykickstart v3.32
+# Generated by pykickstart v3.36
 #version=DEVEL
 # X Window System configuration information
 xconfig  --startxonboot
@@ -36,7 +36,7 @@ zerombr
 clearpart --all
 # Disk partitioning information
 part / --fstype="ext4" --size=5120
-part / --size=7300
+part / --size=7000
 
 %post
 # FIXME: it'd be better to get this installed from a package
@@ -311,7 +311,33 @@ rm -f /boot/*-rescue*
 rm -f /etc/machine-id
 touch /etc/machine-id
 
-# set default GTK+ theme for root (see #683855, #689070, #809.02)
+%end
+
+%post --nochroot
+cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+
+# only works on x86_64
+if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
+    # For livecd-creator builds
+    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+
+    # For lorax/livemedia-creator builds
+    sed -i '
+    /## make boot.iso/ i\
+    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
+    <% f = "usr/bin/livecd-iso-to-disk" %>\
+    %if exists(f):\
+        install ${f} ${LIVEDIR}/${f|basename}\
+    %endif\
+    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+fi
+
+%end
+
+%post
+
+# set default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
@@ -354,20 +380,12 @@ MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-
-# debrand
-#sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop
-#sed -i "s/RHEL/Rocky Linux/g" /usr/share/anaconda/gnome/rhel-welcome
-#sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome
-#sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/anaconda/gnome/rhel-welcome
-#sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/liveinst.desktop
-
 # set executable bit disable KDE security warning
 chmod +x /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
 cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
 
-if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop  ]; then
+if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop   ]; then
   mkdir -p ~liveuser/.config/autostart
   cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/
   cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/
@@ -380,9 +398,6 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF
 
-# Disable plasma-pk-updates if applicable
-rpm -e plasma-pk-updates
-
 # "Disable plasma-discover-notifier"
 mkdir -p /home/liveuser/.config/autostart
 cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/
@@ -394,8 +409,6 @@ cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
 Indexing-Enabled=false
 BALOO_EOF
 
-mkdir -p ~liveuser/.kde/share/config/
-
 # Disable kres-migrator
 cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 [Migration]
@@ -407,6 +420,14 @@ cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
 [Migration]
 alreadyMigrated=true
 KWALLET_EOL
+# Disable automount of 'known' devices
+# https://bugzilla.redhat.com/show_bug.cgi?id=2073708
+cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF
+[General]
+AutomountEnabled=false
+AutomountOnLogin=false
+AutomountOnPlugin=false
+AUTOMOUNTER_EOF
 
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
@@ -420,28 +441,6 @@ dnf config-manager --set-enabled crb
 
 %end
 
-%post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
-
-# only works on x86_64
-if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-    # For livecd-creator builds
-    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-
-    # For lorax/livemedia-creator builds
-    sed -i '
-    /## make boot.iso/ i\
-    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-    <% f = "usr/bin/livecd-iso-to-disk" %>\
-    %if exists(f):\
-        install ${f} ${LIVEDIR}/${f|basename}\
-    %endif\
-    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
-fi
-
-%end
-
 %packages
 @^kde-desktop-environment
 @anaconda-tools
@@ -479,9 +478,9 @@ mariadb-embedded
 mariadb-server
 memtest86+
 sddm
-sddm-themes
 sddm-breeze
 sddm-kcm
+sddm-themes
 syslinux
 -@admin-tools
 -@input-methods
diff --git a/Rocky-9-Workstation-Lite.ks b/Rocky-9-Workstation-Lite.ks
index 1299176..e7a817a 100644
--- a/Rocky-9-Workstation-Lite.ks
+++ b/Rocky-9-Workstation-Lite.ks
@@ -1,4 +1,4 @@
-# Generated by pykickstart v3.32
+# Generated by pykickstart v3.36
 #version=DEVEL
 # X Window System configuration information
 xconfig  --startxonboot
@@ -34,7 +34,7 @@ zerombr
 clearpart --all
 # Disk partitioning information
 part / --fstype="ext4" --size=5120
-part / --size=6656
+part / --size=7750
 
 %post
 # FIXME: it'd be better to get this installed from a package
@@ -309,6 +309,32 @@ rm -f /boot/*-rescue*
 rm -f /etc/machine-id
 touch /etc/machine-id
 
+%end
+
+%post --nochroot
+cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+
+# This only works on x86_64
+if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
+    # For livecd-creator builds
+    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+
+    # For lorax/livemedia-creator builds
+    sed -i '
+    /## make boot.iso/ i\
+    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
+    <% f = "usr/bin/livecd-iso-to-disk" %>\
+    %if exists(f):\
+        install ${f} ${LIVEDIR}/${f|basename}\
+    %endif\
+    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+fi
+
+%end
+
+%post
+
 cat >> /etc/rc.d/init.d/livesys << EOF
 
 
@@ -351,17 +377,12 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
 FOE
 
   # Make the welcome screen show up
   if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then
     mkdir -p ~liveuser/.config/autostart
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop
-    #sed -i "s/RHEL/Rocky Linux/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/anaconda.desktop
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/
   fi
@@ -396,28 +417,6 @@ EOF
 
 %end
 
-%post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
-
-# This only works on x86_64
-if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-    # For livecd-creator builds
-    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-
-    # For lorax/livemedia-creator builds
-    sed -i '
-    /## make boot.iso/ i\
-    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-    <% f = "usr/bin/livecd-iso-to-disk" %>\
-    %if exists(f):\
-        install ${f} ${LIVEDIR}/${f|basename}\
-    %endif\
-    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
-fi
-
-%end
-
 %packages
 @anaconda-tools
 @base-x
@@ -427,6 +426,7 @@ fi
 @guest-desktop-agents
 @hardware-support
 @internet-browser
+@multimedia
 @networkmanager-submodules
 aajohan-comfortaa-fonts
 anaconda
diff --git a/Rocky-9-Workstation.ks b/Rocky-9-Workstation.ks
index 4546bb0..a8d3cd8 100644
--- a/Rocky-9-Workstation.ks
+++ b/Rocky-9-Workstation.ks
@@ -1,4 +1,4 @@
-# Generated by pykickstart v3.32
+# Generated by pykickstart v3.36
 #version=DEVEL
 # X Window System configuration information
 xconfig  --startxonboot
@@ -34,7 +34,7 @@ zerombr
 clearpart --all
 # Disk partitioning information
 part / --fstype="ext4" --size=5120
-part / --size=6656
+part / --size=7750
 
 %post
 # FIXME: it'd be better to get this installed from a package
@@ -309,12 +309,39 @@ rm -f /boot/*-rescue*
 rm -f /etc/machine-id
 touch /etc/machine-id
 
+%end
+
+%post --nochroot
+cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+
+# This only works on x86_64
+if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
+    # For livecd-creator builds
+    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+
+    # For lorax/livemedia-creator builds
+    sed -i '
+    /## make boot.iso/ i\
+    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
+    <% f = "usr/bin/livecd-iso-to-disk" %>\
+    %if exists(f):\
+        install ${f} ${LIVEDIR}/${f|basename}\
+    %endif\
+    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+fi
+
+%end
+
+%post
+
 cat >> /etc/rc.d/init.d/livesys << EOF
 
 
 # disable gnome-software automatically downloading updates
 cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
 [org.gnome.software]
+allow-updates=false
 download-updates=false
 FOE
 
@@ -351,21 +378,21 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
 FOE
 
   # Make the welcome screen show up
   if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then
     mkdir -p ~liveuser/.config/autostart
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop
-    #sed -i "s/RHEL/Rocky Linux/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/anaconda.desktop
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/
   fi
 
+  # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+welcome-dialog-last-shown-version='4294967295'
+FOE
+
   # Copy Anaconda branding in place
   if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
     cp -a /usr/share/lorax/product/* /
@@ -396,28 +423,6 @@ EOF
 
 %end
 
-%post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
-
-# This only works on x86_64
-if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-    # For livecd-creator builds
-    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-
-    # For lorax/livemedia-creator builds
-    sed -i '
-    /## make boot.iso/ i\
-    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-    <% f = "usr/bin/livecd-iso-to-disk" %>\
-    %if exists(f):\
-        install ${f} ${LIVEDIR}/${f|basename}\
-    %endif\
-    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
-fi
-
-%end
-
 %packages
 @anaconda-tools
 @base-x
diff --git a/Rocky-9-XFCE.ks b/Rocky-9-XFCE.ks
index 3a66707..76723c2 100644
--- a/Rocky-9-XFCE.ks
+++ b/Rocky-9-XFCE.ks
@@ -1,4 +1,4 @@
-# Generated by pykickstart v3.32
+# Generated by pykickstart v3.36
 #version=DEVEL
 # X Window System configuration information
 xconfig  --startxonboot
@@ -311,6 +311,31 @@ rm -f /boot/*-rescue*
 rm -f /etc/machine-id
 touch /etc/machine-id
 
+%end
+
+%post --nochroot
+cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+
+# only works on x86_64
+if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
+    # For livecd-creator builds
+    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+
+    # For lorax/livemedia-creator builds
+    sed -i '
+    /## make boot.iso/ i\
+    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
+    <% f = "usr/bin/livecd-iso-to-disk" %>\
+    %if exists(f):\
+        install ${f} ${LIVEDIR}/${f|basename}\
+    %endif\
+    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+fi
+
+%end
+
+%post
 # xfce configuration
 
 # create /etc/sysconfig/desktop (needed for installation)
@@ -324,9 +349,9 @@ cat >> /etc/rc.d/init.d/livesys << EOF
 
 mkdir -p /home/liveuser/.config/xfce4
 # ugly stuff, this should give us a default background for now
-mkdir -p /usr/share/backgrounds/images
-ln -s /usr/share/backgrounds/f32/default/f32.png \
-  /usr/share/backgrounds/images/default.png
+#mkdir -p /usr/share/backgrounds/images
+#ln -s /usr/share/backgrounds/f32/default/f32.png \
+#  /usr/share/backgrounds/images/default.png
 
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
@@ -368,15 +393,15 @@ sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.d
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
 
-# no updater applet in live environment
-rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
-
-if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then
+if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop  ]; then
   mkdir -p ~liveuser/.config/autostart
   cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/
   cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/
 fi
 
+# no updater applet in live environment
+rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
+
 # and mark it as executable (new Xfce security feature)
 chmod +x /home/liveuser/Desktop/liveinst.desktop
 
@@ -391,32 +416,12 @@ EOF
 
 # this doesn't come up automatically. not sure why.
 systemctl enable --force lightdm.service
+
+# CRB needs to be enabled for EPEL to function.
 dnf config-manager --set-enabled crb
 
 %end
 
-%post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
-
-# only works on x86_64
-if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-    # For livecd-creator builds
-    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-
-    # For lorax/livemedia-creator builds
-    sed -i '
-    /## make boot.iso/ i\
-    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-    <% f = "usr/bin/livecd-iso-to-disk" %>\
-    %if exists(f):\
-        install ${f} ${LIVEDIR}/${f|basename}\
-    %endif\
-    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
-fi
-
-%end
-
 %packages
 @anaconda-tools
 @base-x
@@ -436,38 +441,31 @@ anaconda-live
 chkconfig
 dracut-live
 epel-release
-f32-backgrounds-extras-xfce
-f32-backgrounds-xfce
+f35-backgrounds-extras-xfce
+f35-backgrounds-xfce
 firefox
 firewall-config
-geany
 glibc-all-langpacks
 gparted
 initscripts
 kernel
 kernel-modules
 kernel-modules-extra
+lightdm
 memtest86+
-mousepad
 pavucontrol
 pcp-selinux
-pidgin
-rhythmbox
-ristretto
 rocky-backgrounds
-lightdm
 seahorse
 syslinux
 thunderbird
-transmission
 wget
+xdg-user-dirs
+xdg-user-dirs-gtk
 xfce4-about
 xfce4-appfinder
-xfce4-battery-plugin
 xfce4-datetime-plugin
 xfce4-netload-plugin
-xfce4-places-plugin
-xfce4-pulseaudio-plugin
 xfce4-screenshooter-plugin
 xfce4-smartbookmark-plugin
 xfce4-systemload-plugin
@@ -475,10 +473,6 @@ xfce4-taskmanager
 xfce4-time-out-plugin
 xfce4-weather-plugin
 xfce4-whiskermenu-plugin
-xfdashboard
-xfdashboard-themes
-xdg-user-dirs
-xdg-user-dirs-gtk
 -acpid
 -aspell-*
 -autofs
@@ -497,4 +491,3 @@ xdg-user-dirs-gtk
 -xsane-gimp
 
 %end
-
diff --git a/live/9/prod/rocky-live-kde-base.ks b/live/9/prod/rocky-live-kde-base.ks
index 35870c1..d2ffac2 100644
--- a/live/9/prod/rocky-live-kde-base.ks
+++ b/live/9/prod/rocky-live-kde-base.ks
@@ -5,7 +5,7 @@
 
 %post
 
-# set default GTK+ theme for root (see #683855, #689070, #809.02)
+# set default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
@@ -48,14 +48,6 @@ MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-
-# debrand
-#sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop
-#sed -i "s/RHEL/Rocky Linux/g" /usr/share/anaconda/gnome/rhel-welcome
-#sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome
-#sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/anaconda/gnome/rhel-welcome
-#sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/liveinst.desktop
-
 # set executable bit disable KDE security warning
 chmod +x /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
@@ -74,9 +66,6 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF
 
-# Disable plasma-pk-updates if applicable
-rpm -e plasma-pk-updates
-
 # "Disable plasma-discover-notifier"
 mkdir -p /home/liveuser/.config/autostart
 cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/
@@ -88,8 +77,6 @@ cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
 Indexing-Enabled=false
 BALOO_EOF
 
-mkdir -p ~liveuser/.kde/share/config/
-
 # Disable kres-migrator
 cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 [Migration]
@@ -101,6 +88,14 @@ cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
 [Migration]
 alreadyMigrated=true
 KWALLET_EOL
+# Disable automount of 'known' devices
+# https://bugzilla.redhat.com/show_bug.cgi?id=2073708
+cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF
+[General]
+AutomountEnabled=false
+AutomountOnLogin=false
+AutomountOnPlugin=false
+AUTOMOUNTER_EOF
 
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
diff --git a/live/9/prod/rocky-live-kde-common.ks b/live/9/prod/rocky-live-kde-common.ks
index 510ad38..7f03d2c 100644
--- a/live/9/prod/rocky-live-kde-common.ks
+++ b/live/9/prod/rocky-live-kde-common.ks
@@ -32,7 +32,6 @@ mariadb-connector-c
 mariadb-server
 
 # minimal localization support - allows installing the kde-l10n-* packages
-#system-config-language <- Not in EL8
 #kde-l10n <- Not in EL8
 
 # unwanted packages from @kde-desktop
diff --git a/live/9/prod/rocky-live-workstation-lite.ks b/live/9/prod/rocky-live-workstation-lite.ks
index abf15ca..1825458 100644
--- a/live/9/prod/rocky-live-workstation-lite.ks
+++ b/live/9/prod/rocky-live-workstation-lite.ks
@@ -9,7 +9,7 @@
 #
 #include snippets/packagekit-cached-metadata.ks
 
-part / --size 6656
+part / --size 7750
 
 %post
 
@@ -55,17 +55,12 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
 FOE
 
   # Make the welcome screen show up
   if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then
     mkdir -p ~liveuser/.config/autostart
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop
-    #sed -i "s/RHEL/Rocky Linux/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/anaconda.desktop
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/
   fi
diff --git a/live/9/prod/rocky-live-workstation.ks b/live/9/prod/rocky-live-workstation.ks
index 08f9b73..c551274 100644
--- a/live/9/prod/rocky-live-workstation.ks
+++ b/live/9/prod/rocky-live-workstation.ks
@@ -9,7 +9,7 @@
 #
 #include snippets/packagekit-cached-metadata.ks
 
-part / --size 6656
+part / --size 7750
 
 %post
 
@@ -19,6 +19,7 @@ cat >> /etc/rc.d/init.d/livesys << EOF
 # disable gnome-software automatically downloading updates
 cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
 [org.gnome.software]
+allow-updates=false
 download-updates=false
 FOE
 
@@ -55,21 +56,21 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
 FOE
 
   # Make the welcome screen show up
   if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then
     mkdir -p ~liveuser/.config/autostart
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop
-    #sed -i "s/RHEL/Rocky Linux/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/anaconda.desktop
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/
   fi
 
+  # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+welcome-dialog-last-shown-version='4294967295'
+FOE
+
   # Copy Anaconda branding in place
   if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
     cp -a /usr/share/lorax/product/* /
diff --git a/live/9/prod/rocky-live-xfce-common.ks b/live/9/prod/rocky-live-xfce-common.ks
index 2df7f08..aea6b45 100644
--- a/live/9/prod/rocky-live-xfce-common.ks
+++ b/live/9/prod/rocky-live-xfce-common.ks
@@ -10,12 +10,12 @@
 #@xfce-office
 
 # Manual install...
-geany
+#geany
 gparted
-mousepad
-ristretto
+#mousepad
+#ristretto
 seahorse
-transmission
+#transmission
 pcp-selinux
 lightdm
 #gdm
@@ -27,31 +27,31 @@ lightdm
 firefox
 thunderbird
 firewall-config
-pidgin
+#pidgin
 rocky-backgrounds
 gparted
-rhythmbox
+#rhythmbox
 
 # extras
-f32-backgrounds-xfce
-f32-backgrounds-extras-xfce
+f35-backgrounds-xfce
+f35-backgrounds-extras-xfce
 
 xfce4-about
 xfce4-appfinder
 xfce4-taskmanager
-xfce4-pulseaudio-plugin
-xfce4-battery-plugin
+#xfce4-pulseaudio-plugin
+#xfce4-battery-plugin
 xfce4-datetime-plugin
 xfce4-netload-plugin
-xfce4-places-plugin
+#xfce4-places-plugin
 xfce4-screenshooter-plugin
 xfce4-smartbookmark-plugin
 xfce4-systemload-plugin
 xfce4-time-out-plugin
 xfce4-weather-plugin
 xfce4-whiskermenu-plugin
-xfdashboard
-xfdashboard-themes
+#xfdashboard
+#xfdashboard-themes
 pavucontrol
 
 wget
diff --git a/live/9/prod/rocky-live-xfce.ks b/live/9/prod/rocky-live-xfce.ks
index e6508cc..797208b 100644
--- a/live/9/prod/rocky-live-xfce.ks
+++ b/live/9/prod/rocky-live-xfce.ks
@@ -20,9 +20,9 @@ cat >> /etc/rc.d/init.d/livesys << EOF
 
 mkdir -p /home/liveuser/.config/xfce4
 # ugly stuff, this should give us a default background for now
-mkdir -p /usr/share/backgrounds/images
-ln -s /usr/share/backgrounds/f32/default/f32.png \
-  /usr/share/backgrounds/images/default.png
+#mkdir -p /usr/share/backgrounds/images
+#ln -s /usr/share/backgrounds/f32/default/f32.png \
+#  /usr/share/backgrounds/images/default.png
 
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
@@ -87,6 +87,8 @@ EOF
 
 # this doesn't come up automatically. not sure why.
 systemctl enable --force lightdm.service
+
+# CRB needs to be enabled for EPEL to function.
 dnf config-manager --set-enabled crb
 
 %end
diff --git a/live/9/stage/rocky-live-base-spin.ks b/live/9/stage/rocky-live-base-spin.ks
index 820468a..be0e486 100644
--- a/live/9/stage/rocky-live-base-spin.ks
+++ b/live/9/stage/rocky-live-base-spin.ks
@@ -217,7 +217,7 @@ touch /.liveimg-configured
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
 # the hostname must be something else than 'localhost'
 # https://bugzilla.redhat.com/show_bug.cgi?id=1370222
-echo "localhost" > /etc/hostname
+echo "localhost-live" > /etc/hostname
 
 EOF
 
diff --git a/live/9/stage/rocky-live-base.ks b/live/9/stage/rocky-live-base.ks
index c904d95..5b4946b 100644
--- a/live/9/stage/rocky-live-base.ks
+++ b/live/9/stage/rocky-live-base.ks
@@ -213,7 +213,7 @@ touch /.liveimg-configured
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
 # the hostname must be something else than 'localhost'
 # https://bugzilla.redhat.com/show_bug.cgi?id=1370222
-echo "localhost" > /etc/hostname
+echo "localhost-live" > /etc/hostname
 
 EOF
 
diff --git a/live/9/stage/rocky-live-kde-base.ks b/live/9/stage/rocky-live-kde-base.ks
index 35870c1..d2ffac2 100644
--- a/live/9/stage/rocky-live-kde-base.ks
+++ b/live/9/stage/rocky-live-kde-base.ks
@@ -5,7 +5,7 @@
 
 %post
 
-# set default GTK+ theme for root (see #683855, #689070, #809.02)
+# set default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
@@ -48,14 +48,6 @@ MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-
-# debrand
-#sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop
-#sed -i "s/RHEL/Rocky Linux/g" /usr/share/anaconda/gnome/rhel-welcome
-#sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome
-#sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/anaconda/gnome/rhel-welcome
-#sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/liveinst.desktop
-
 # set executable bit disable KDE security warning
 chmod +x /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
@@ -74,9 +66,6 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF
 
-# Disable plasma-pk-updates if applicable
-rpm -e plasma-pk-updates
-
 # "Disable plasma-discover-notifier"
 mkdir -p /home/liveuser/.config/autostart
 cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/
@@ -88,8 +77,6 @@ cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
 Indexing-Enabled=false
 BALOO_EOF
 
-mkdir -p ~liveuser/.kde/share/config/
-
 # Disable kres-migrator
 cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 [Migration]
@@ -101,6 +88,14 @@ cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
 [Migration]
 alreadyMigrated=true
 KWALLET_EOL
+# Disable automount of 'known' devices
+# https://bugzilla.redhat.com/show_bug.cgi?id=2073708
+cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF
+[General]
+AutomountEnabled=false
+AutomountOnLogin=false
+AutomountOnPlugin=false
+AUTOMOUNTER_EOF
 
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
diff --git a/live/9/stage/rocky-live-kde-common.ks b/live/9/stage/rocky-live-kde-common.ks
index 510ad38..7f03d2c 100644
--- a/live/9/stage/rocky-live-kde-common.ks
+++ b/live/9/stage/rocky-live-kde-common.ks
@@ -32,7 +32,6 @@ mariadb-connector-c
 mariadb-server
 
 # minimal localization support - allows installing the kde-l10n-* packages
-#system-config-language <- Not in EL8
 #kde-l10n <- Not in EL8
 
 # unwanted packages from @kde-desktop
diff --git a/live/9/stage/rocky-live-workstation-lite.ks b/live/9/stage/rocky-live-workstation-lite.ks
index abf15ca..1825458 100644
--- a/live/9/stage/rocky-live-workstation-lite.ks
+++ b/live/9/stage/rocky-live-workstation-lite.ks
@@ -9,7 +9,7 @@
 #
 #include snippets/packagekit-cached-metadata.ks
 
-part / --size 6656
+part / --size 7750
 
 %post
 
@@ -55,17 +55,12 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
 FOE
 
   # Make the welcome screen show up
   if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then
     mkdir -p ~liveuser/.config/autostart
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop
-    #sed -i "s/RHEL/Rocky Linux/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/anaconda.desktop
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/
   fi
diff --git a/live/9/stage/rocky-live-workstation.ks b/live/9/stage/rocky-live-workstation.ks
index 08f9b73..c551274 100644
--- a/live/9/stage/rocky-live-workstation.ks
+++ b/live/9/stage/rocky-live-workstation.ks
@@ -9,7 +9,7 @@
 #
 #include snippets/packagekit-cached-metadata.ks
 
-part / --size 6656
+part / --size 7750
 
 %post
 
@@ -19,6 +19,7 @@ cat >> /etc/rc.d/init.d/livesys << EOF
 # disable gnome-software automatically downloading updates
 cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
 [org.gnome.software]
+allow-updates=false
 download-updates=false
 FOE
 
@@ -55,21 +56,21 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
 FOE
 
   # Make the welcome screen show up
   if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then
     mkdir -p ~liveuser/.config/autostart
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop
-    #sed -i "s/RHEL/Rocky Linux/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/anaconda/gnome/rhel-welcome
-    #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/anaconda.desktop
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/
     cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/
   fi
 
+  # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+welcome-dialog-last-shown-version='4294967295'
+FOE
+
   # Copy Anaconda branding in place
   if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
     cp -a /usr/share/lorax/product/* /
diff --git a/live/9/stage/rocky-live-xfce-common.ks b/live/9/stage/rocky-live-xfce-common.ks
index 2df7f08..aea6b45 100644
--- a/live/9/stage/rocky-live-xfce-common.ks
+++ b/live/9/stage/rocky-live-xfce-common.ks
@@ -10,12 +10,12 @@
 #@xfce-office
 
 # Manual install...
-geany
+#geany
 gparted
-mousepad
-ristretto
+#mousepad
+#ristretto
 seahorse
-transmission
+#transmission
 pcp-selinux
 lightdm
 #gdm
@@ -27,31 +27,31 @@ lightdm
 firefox
 thunderbird
 firewall-config
-pidgin
+#pidgin
 rocky-backgrounds
 gparted
-rhythmbox
+#rhythmbox
 
 # extras
-f32-backgrounds-xfce
-f32-backgrounds-extras-xfce
+f35-backgrounds-xfce
+f35-backgrounds-extras-xfce
 
 xfce4-about
 xfce4-appfinder
 xfce4-taskmanager
-xfce4-pulseaudio-plugin
-xfce4-battery-plugin
+#xfce4-pulseaudio-plugin
+#xfce4-battery-plugin
 xfce4-datetime-plugin
 xfce4-netload-plugin
-xfce4-places-plugin
+#xfce4-places-plugin
 xfce4-screenshooter-plugin
 xfce4-smartbookmark-plugin
 xfce4-systemload-plugin
 xfce4-time-out-plugin
 xfce4-weather-plugin
 xfce4-whiskermenu-plugin
-xfdashboard
-xfdashboard-themes
+#xfdashboard
+#xfdashboard-themes
 pavucontrol
 
 wget
diff --git a/live/9/stage/rocky-live-xfce.ks b/live/9/stage/rocky-live-xfce.ks
index e6508cc..797208b 100644
--- a/live/9/stage/rocky-live-xfce.ks
+++ b/live/9/stage/rocky-live-xfce.ks
@@ -20,9 +20,9 @@ cat >> /etc/rc.d/init.d/livesys << EOF
 
 mkdir -p /home/liveuser/.config/xfce4
 # ugly stuff, this should give us a default background for now
-mkdir -p /usr/share/backgrounds/images
-ln -s /usr/share/backgrounds/f32/default/f32.png \
-  /usr/share/backgrounds/images/default.png
+#mkdir -p /usr/share/backgrounds/images
+#ln -s /usr/share/backgrounds/f32/default/f32.png \
+#  /usr/share/backgrounds/images/default.png
 
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
@@ -87,6 +87,8 @@ EOF
 
 # this doesn't come up automatically. not sure why.
 systemctl enable --force lightdm.service
+
+# CRB needs to be enabled for EPEL to function.
 dnf config-manager --set-enabled crb
 
 %end