diff --git a/fedora-riscv64-minimal-f40.ks b/fedora-riscv64-minimal-f40.ks
index dcac10d..3713e22 100644
--- a/fedora-riscv64-minimal-f40.ks
+++ b/fedora-riscv64-minimal-f40.ks
@@ -78,7 +78,7 @@ cloud-utils-growpart
 
 %post
 # Disable default repositories (not riscv64 in upstream)
-dnf config-manager --set-disabled rawhide updates updates-testing fedora fedora-cisco-openh264
+dnf config-manager --set-disabled updates updates-testing fedora fedora-cisco-openh264
 
 dnf -y remove dracut-config-generic
 
@@ -96,7 +96,8 @@ sed -i 's|noatime|noatime,x-systemd.device-timeout=300s,x-systemd.mount-timeout=
 /usr/sbin/useradd -c "Fedora RISCV User" riscv
 echo fedora_rocks! | passwd --stdin riscv
 /usr/sbin/usermod -aG wheel riscv
-/usr/sbin/usermod -aG mock riscv
+# Mock is not installed by default in Minimal disk image
+#/usr/sbin/usermod -aG mock riscv
 
 # Create Fedora RISC-V repo
 cat << EOF > /etc/yum.repos.d/fedora-riscv.repo