diff --git a/.github/workflows/tests_archdetect.yml b/.github/workflows/tests_archdetect.yml
index 891669a2..154d3a1c 100644
--- a/.github/workflows/tests_archdetect.yml
+++ b/.github/workflows/tests_archdetect.yml
@@ -25,7 +25,7 @@ jobs:
           - aarch64/neoverse_v1/AWS-awslinux-graviton3
           - aarch64/nvidia/grace/Jureca-Rocky95
           - aarch64/google/axion/GCP-axion
-          - riscv64/sifive/premier-Ubuntu24
+          - riscv64/sifive/p550/premier-Ubuntu24
           - riscv64/spacemit/bananaf3-Armbian
           - riscv64/spacemit/bananaf3-k6.6
           # commented out since these targets are currently not supported in software.eessi.io repo
diff --git a/init/arch_specs/eessi_arch_riscv.spec b/init/arch_specs/eessi_arch_riscv.spec
index aa56fcaa..59f708dd 100644
--- a/init/arch_specs/eessi_arch_riscv.spec
+++ b/init/arch_specs/eessi_arch_riscv.spec
@@ -3,5 +3,6 @@
 
 # Software path in EESSI 	| Vendor ID 	| List of defining CPU features
 "riscv64/sifive/p550"		"0x489"		"rv64imafdch_zicsr_zifencei_zba_zbb_sscofpmf"	# HiFive Premier P550
+"riscv64/sifive/u74-mc"		"0x489"		"rv64imafdc_zicntr_zicsr_zifencei_zihpm_zca_zcd_zba_zbb"    # StarFive VisionFive 2
 "riscv64/spacemit/x60"		"0x710"		"rv64imafdcv_sscofpmf_sstc_svpbmt_zicbom_zicboz_zicbop_zihintpause"	# Banana Pi F3
 "riscv64/spacemit/x60-k6.6"	"0x710"		"rv64imafdcv_zicbom_zicboz_zicntr_zicond_zicsr_zifencei_zihintpause_zihpm_zfh_zfhmin_zca_zcd_zba_zbb_zbc_zbs_zkt_zve32f_zve32x_zve64d_zve64f_zve64x_zvfh_zvfhmin_zvkt_sscofpmf_sstc_svinval_svnapot_svpbmt"	# Banana Pi F3 k6.6
diff --git a/tests/archdetect/riscv64/sifive/premier-Ubuntu24.all.output b/tests/archdetect/riscv64/sifive/p550/premier-Ubuntu24.all.output
similarity index 100%
rename from tests/archdetect/riscv64/sifive/premier-Ubuntu24.all.output
rename to tests/archdetect/riscv64/sifive/p550/premier-Ubuntu24.all.output
diff --git a/tests/archdetect/riscv64/sifive/premier-Ubuntu24.cpuinfo b/tests/archdetect/riscv64/sifive/p550/premier-Ubuntu24.cpuinfo
similarity index 100%
rename from tests/archdetect/riscv64/sifive/premier-Ubuntu24.cpuinfo
rename to tests/archdetect/riscv64/sifive/p550/premier-Ubuntu24.cpuinfo
diff --git a/tests/archdetect/riscv64/sifive/premier-Ubuntu24.output b/tests/archdetect/riscv64/sifive/p550/premier-Ubuntu24.output
similarity index 100%
rename from tests/archdetect/riscv64/sifive/premier-Ubuntu24.output
rename to tests/archdetect/riscv64/sifive/p550/premier-Ubuntu24.output
diff --git a/tests/archdetect/riscv64/sifive/u74-mc/starvision-Ubuntu24.all.output b/tests/archdetect/riscv64/sifive/u74-mc/starvision-Ubuntu24.all.output
new file mode 100644
index 00000000..81973426
--- /dev/null
+++ b/tests/archdetect/riscv64/sifive/u74-mc/starvision-Ubuntu24.all.output
@@ -0,0 +1 @@
+riscv64/sifive/u74-mc:riscv64/generic
diff --git a/tests/archdetect/riscv64/sifive/u74-mc/starvision-Ubuntu24.cpuinfo b/tests/archdetect/riscv64/sifive/u74-mc/starvision-Ubuntu24.cpuinfo
new file mode 100644
index 00000000..0a714672
--- /dev/null
+++ b/tests/archdetect/riscv64/sifive/u74-mc/starvision-Ubuntu24.cpuinfo
@@ -0,0 +1,9 @@
+processor	: 0
+hart		: 1
+isa		: rv64imafdc_zicntr_zicsr_zifencei_zihpm_zca_zcd_zba_zbb
+mmu		: sv39
+uarch		: sifive,u74-mc
+mvendorid	: 0x489
+marchid		: 0x8000000000000007
+mimpid		: 0x4210427
+hart isa	: rv64imafdc_zicntr_zicsr_zifencei_zihpm_zca_zcd_zba_zbb
diff --git a/tests/archdetect/riscv64/sifive/u74-mc/starvision-Ubuntu24.output b/tests/archdetect/riscv64/sifive/u74-mc/starvision-Ubuntu24.output
new file mode 100644
index 00000000..aa779a2b
--- /dev/null
+++ b/tests/archdetect/riscv64/sifive/u74-mc/starvision-Ubuntu24.output
@@ -0,0 +1 @@
+riscv64/sifive/u74-mc