diff --git a/minimal/bootupd.yaml b/minimal/bootupd.yaml
index 6b55aa3..2932317 100644
--- a/minimal/bootupd.yaml
+++ b/minimal/bootupd.yaml
@@ -8,6 +8,14 @@ packages-aarch64:
   - grub2-efi-aa64 efibootmgr shim
 packages-ppc64le:
   - grub2 ostree-grub2
+packages-riscv64:
+  - grub2-efi-riscv64 efibootmgr
+  # Don't specify just `shim` for now because riscv isn't built in
+  # main koji instance yet and thus isn't signed. Here we specify
+  # the path to the provided file so when we do switch to the signed
+  # `shim` package it will transparently happen and we can clean up
+  # this packagelist entry later.
+  - /boot/efi/EFI/fedora/shimriscv64.efi
 packages-s390x:
   # For zipl
   - s390utils-core
diff --git a/standard/coreos-user-experience.yaml b/standard/coreos-user-experience.yaml
index 1ca6463..295ea0b 100644
--- a/standard/coreos-user-experience.yaml
+++ b/standard/coreos-user-experience.yaml
@@ -6,19 +6,26 @@ packages:
   # Improved MOTD experience
   - console-login-helper-messages-issuegen
   - console-login-helper-messages-profile
-  # kdump support
-  # https://github.com/coreos/fedora-coreos-tracker/issues/622
-  # The makedumpfile and kdump-utils RPMs were broken out in
-  # Fedora and EL10+. To be able to use the same package list
-  # Across EL9 + Fedora + EL10 let's just name paths for now.
-  # We can go back to just specifying the RPM names when we
-  # no longer support EL9.
-  - kexec-tools
-  - /usr/share/makedumpfile # makedumpfile RPM
-  - /usr/bin/kdumpctl       # kdump-utils RPM
   # Container tooling
   - toolbox
   # nvme-cli for managing nvme disks
   - nvme-cli
   # Used by admins interactively
   - lsof
+
+conditional-include:
+  - if: basearch != "riscv64"
+    # TODO: kexec-tools isn't built for riscv yet so conditionalize these here
+    #       https://github.com/coreos/fedora-coreos-tracker/issues/1931
+    include:
+      packages:
+        # kdump support
+        # https://github.com/coreos/fedora-coreos-tracker/issues/622
+        # The makedumpfile and kdump-utils RPMs were broken out in
+        # Fedora and EL10+. To be able to use the same package list
+        # Across EL9 + Fedora + EL10 let's just name paths for now.
+        # We can go back to just specifying the RPM names when we
+        # no longer support EL9.
+        - kexec-tools
+        - /usr/share/makedumpfile # makedumpfile RPM
+        - /usr/bin/kdumpctl       # kdump-utils RPM