diff --git a/dv/uvm/Makefile b/dv/uvm/Makefile
index 30c46b44..821426f5 100644
--- a/dv/uvm/Makefile
+++ b/dv/uvm/Makefile
@@ -84,8 +84,8 @@ RISCV_DV_OPTS=--custom_target=${DV_DIR}/riscv_dv_extension \
      ${RISCV_DV_OPTS} \
      ${COMMON_OPTS} \
      ${CSR_OPTS} \
-     --sim_opts="+uvm_set_type_override=riscv_asm_program_gen,ibex_asm_program_gen \
-                 +signature_addr=0x${SIGNATURE_ADDR}";
+     --sim_opts="+uvm_set_inst_override=riscv_asm_program_gen,ibex_asm_program_gen,"uvm_test_top.asm_gen" \
+                 +signature_addr=${SIGNATURE_ADDR}";
 
 # Compile the generated assmebly programs to ELF/BIN
 gcc_compile: