diff --git a/pungi/arch_utils.py b/pungi/arch_utils.py
index 67da2daa..7367d8ad 100644
--- a/pungi/arch_utils.py
+++ b/pungi/arch_utils.py
@@ -85,7 +85,7 @@ arches = {
     # itanium
     "ia64": "noarch",
     # riscv64
-    "riscv64": "riscv64",
+    "riscv64": "noarch",
 }
 
 #  Will contain information parsed from /proc/self/auxv via _parse_auxv().