diff --git a/mlonmcu/target/riscv/riscv.py b/mlonmcu/target/riscv/riscv.py
index 20c4ee23..8941b5ff 100644
--- a/mlonmcu/target/riscv/riscv.py
+++ b/mlonmcu/target/riscv/riscv.py
@@ -81,15 +81,19 @@ def reconfigure(self):
 
     @property
     def riscv_gcc_prefix(self):
-        return Path(
+        ret = Path(
             pick_first(
                 self.config,
                 [
+                    f"riscv_gcc_{self.arch}_{self.abi}.install_dir",
+                    f"riscv_gcc_{self.arch}.install_dir",
                     f"riscv_gcc_rv{self.xlen}.install_dir",
                     "riscv_gcc.install_dir",
                 ],
             )
         )
+        # TODO: handle none
+        return ret
 
     @property
     def riscv_gcc_basename(self):
@@ -97,6 +101,8 @@ def riscv_gcc_basename(self):
             pick_first(
                 self.config,
                 [
+                    f"riscv_gcc_{self.arch}_{self.abi}.name",
+                    f"riscv_gcc_{self.arch}.name",
                     f"riscv_gcc_rv{self.xlen}.name",
                     "riscv_gcc.name",
                 ],
@@ -117,6 +123,7 @@ def gcc_variant(self):
             pick_first(
                 self.config,
                 [
+                    f"riscv_gcc_{self.arch}_{self.abi}.variant",
                     f"riscv_gcc_rv{self.xlen}.variant",
                     "riscv_gcc.variant",
                 ],