diff --git a/dv/uvm/Makefile b/dv/uvm/Makefile
index 6a937c4f..d827ad3b 100644
--- a/dv/uvm/Makefile
+++ b/dv/uvm/Makefile
@@ -75,8 +75,7 @@ RISCV_DV_OPTS=--custom_target=${DV_DIR}/riscv_dv_extension \
 # Generate random instructions
 .SILENT gen:
 	mkdir -p ${OUT}
-	cd ${GEN_DIR}; \
-	python3 ./run.py \
+	python3 ${GEN_DIR}/run.py \
      --output=${OUT}/instr_gen ${GEN_OPTS} \
      --steps=gen \
      --gen_timeout=${TIMEOUT} \
@@ -90,8 +89,7 @@ RISCV_DV_OPTS=--custom_target=${DV_DIR}/riscv_dv_extension \
 
 # Compile the generated assmebly programs to ELF/BIN
 gcc_compile:
-	cd ${GEN_DIR}; \
-	python3 ./run.py \
+	python3 ${GEN_DIR}/run.py \
      --o=${OUT}/instr_gen ${GEN_OPTS} \
      --steps=gcc_compile \
      ${COMMON_OPTS} \
@@ -100,10 +98,8 @@ gcc_compile:
 
 # ISS simulation
 iss_sim:
-	cd ${GEN_DIR}; \
-	python3 ./run.py \
+	python3 ${GEN_DIR}/run.py \
      --o=${OUT}/instr_gen ${GEN_OPTS} \
-     --riscv_dv_root=${GEN_DIR} \
      --steps=iss_sim \
      ${COMMON_OPTS} \
      --iss=${ISS} \