diff --git a/target/snitch_cluster/Makefile b/target/snitch_cluster/Makefile
index d1b7d8129..80220be08 100644
--- a/target/snitch_cluster/Makefile
+++ b/target/snitch_cluster/Makefile
@@ -181,10 +181,10 @@ $(PERIPH_DIR)/snitch_cluster_peripheral_reg_top.sv: $(PERIPH_DIR)/snitch_cluster
 # Bootrom
 .PHONY: bootrom
 bootrom: test/snitch_bootrom.sv
-test/bootrom.elf test/bootrom.dump test/bootrom.bin test/snitch_bootrom.sv: test/bootrom.S test/bootrom.ld
-	riscv riscv32-unknown-elf-gcc -mabi=ilp32d -march=rv32imafd -static -nostartfiles -Lsw/runtime/rtl -Ttest/bootrom.ld test/bootrom.S -o test/bootrom.elf
-	riscv riscv32-unknown-elf-objdump -d test/bootrom.elf > test/bootrom.dump
-	riscv riscv32-unknown-elf-objcopy -j .text -O binary test/bootrom.elf test/bootrom.bin
+test/bootrom.elf test/bootrom.dump test/bootrom.bin test/snitch_bootrom.sv: test/bootrom.S test/bootrom.ld util/gen_bootrom.py
+	$(RISCV_CC) -mabi=ilp32d -march=rv32imafd -static -nostartfiles -fuse-ld=$(RISCV_LD) -Lsw/runtime -Ttest/bootrom.ld $< -o $@
+	$(RISCV_OBJDUMP) -d test/bootrom.elf > test/bootrom.dump
+	$(RISCV_OBJCOPY) -j .text -O binary test/bootrom.elf test/bootrom.bin
 	util/gen_bootrom.py --sv-module snitch_bootrom test/bootrom.bin > test/snitch_bootrom.sv
 
 #############
diff --git a/target/snitch_cluster/test/bootrom.dump b/target/snitch_cluster/test/bootrom.dump
index c0db3762a..c099da420 100644
--- a/target/snitch_cluster/test/bootrom.dump
+++ b/target/snitch_cluster/test/bootrom.dump
@@ -1,14 +1,14 @@
 
-test/bootrom.elf:     file format elf32-littleriscv
+test/bootrom.elf:	file format elf32-littleriscv
 
 
 Disassembly of section .text:
 
-80000000 <_l3_base>:
-80000000:	800002b7          	lui	t0,0x80000
-80000004:	00028293          	mv	t0,t0
-80000008:	00028067          	jr	t0 # 80000000 <wfi_loop+0xfffffff4>
+80000000 <_start>:
+80000000: b7 02 00 80  	lui	t0, 524288
+80000004: 93 82 02 00  	mv	t0, t0
+80000008: 67 80 02 00  	jr	t0
 
 8000000c <wfi_loop>:
-8000000c:	10500073          	wfi
-80000010:	ffdff06f          	j	8000000c <wfi_loop>
+8000000c: 73 00 50 10  	wfi	
+80000010: 6f f0 df ff  	j	0x8000000c <wfi_loop>
diff --git a/target/snitch_cluster/test/bootrom.elf b/target/snitch_cluster/test/bootrom.elf
index 4a05aa9f6..cdb1c18c2 100755
Binary files a/target/snitch_cluster/test/bootrom.elf and b/target/snitch_cluster/test/bootrom.elf differ
diff --git a/target/snitch_cluster/test/snitch_bootrom.sv b/target/snitch_cluster/test/snitch_bootrom.sv
old mode 100644
new mode 100755