diff --git a/kernel.spec b/kernel.spec
index f3771762c..813f6b847 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -508,11 +508,11 @@ Summary: The Linux kernel
 %endif
 
 %ifarch riscv64
-%define all_arch_configs kernel-%{version}-riscv64*.config
+%define all_arch_configs %{name}-%{specrpmversion}-aarch64*.config
 %define asmarch riscv
 %define hdrarch riscv
-%define make_target Image.gz
-%define kernel_image arch/riscv/boot/Image.gz
+%define make_target vmlinuz.efi
+%define kernel_image arch/riscv/boot/vmlinuz.efi
 %endif
 
 # Should make listnewconfig fail if there's config options