diff --git a/linux/testvector-generation/genInitMem.sh b/linux/testvector-generation/genInitMem.sh
index c78485958..46ce174ec 100755
--- a/linux/testvector-generation/genInitMem.sh
+++ b/linux/testvector-generation/genInitMem.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 tcpPort=1235
-imageDir=/home/jpease/repos/buildroot3/output/images
-tvDir=linux-testvectors
+imageDir=$RISCV/buildroot/output/images
+tvDir=$RISCV/linux-testvectors
 rawRamFile="$tvDir/ramGDB.bin"
 ramFile="$tvDir/ram.bin"
 rawBootmemFile="$tvDir/bootmemGDB.bin"
 bootmemFile="$tvDir/bootmem.bin"
 rawUntrimmedBootmemFile="$tvDir/untrimmedBootmemFileGDB.bin"
 untrimmedBootmemFile="$tvDir/untrimmedBootmemFile.bin"
+DEVICE_TREE=../devicetree/wally-virt.dtb
 
 read -p "Warning: running this script will overwrite the contents of:
   * $rawRamFile
@@ -36,7 +37,7 @@ then
 
     echo "Launching QEMU in replay mode!"
     (qemu-system-riscv64 \
-    -M virt -dtb /home/jpease/repos/buildroot3/output/images/wally-artya7.dtb \
+    -M virt -m 256M -dtb $DEVICE_TREE \
     -nographic \
     -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \
     -gdb tcp::$tcpPort -S) \
@@ -53,7 +54,7 @@ then
     -ex "printf \"Warning - please verify that the second half of $rawUntrimmedBootmemFile is all 0s\n\"" \
     -ex "dump binary memory $rawUntrimmedBootmemFile 0x1000 0x2fff" \
     -ex "printf \"Creating $rawRamFile\n\"" \
-    -ex "dump binary memory $rawRamFile 0x80000000 0x87ffffff" \
+    -ex "dump binary memory $rawRamFile 0x80000000 0x8fffffff" \
     -ex "kill" \
     -ex "q"
 
diff --git a/linux/testvector-generation/genRecording.sh b/linux/testvector-generation/genRecording.sh
index f9538e145..c55c270a5 100755
--- a/linux/testvector-generation/genRecording.sh
+++ b/linux/testvector-generation/genRecording.sh
@@ -2,6 +2,7 @@
 imageDir=$RISCV/buildroot/output/images
 tvDir=$RISCV/linux-testvectors
 recordFile="$tvDir/all.qemu"
+DEVICE_TREE=../devicetree/wally-virt.dtb
 
 read -p "Warning: running this script will overwrite $recordFile
 Would you like to proceed? (y/n) " -n 1 -r
@@ -24,7 +25,7 @@ then
 
     echo "Launching QEMU in record mode!"
     qemu-system-riscv64 \
-    -M virt -dtb $imageDir/wally-virt.dtb \
+    -M virt -m 256M -dtb $DEVICE_TREE \
     -nographic \
     -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \
     -singlestep -rtc clock=vm -icount shift=0,align=off,sleep=on,rr=record,rrfile=$recordFile
diff --git a/linux/testvector-generation/genTrace.sh b/linux/testvector-generation/genTrace.sh
index 76a6a10c6..3f63d4df8 100755
--- a/linux/testvector-generation/genTrace.sh
+++ b/linux/testvector-generation/genTrace.sh
@@ -6,6 +6,7 @@ recordFile="$tvDir/all.qemu"
 traceFile="$tvDir/all.txt"
 trapsFile="$tvDir/traps.txt"
 interruptsFile="$tvDir/interrupts.txt"
+DEVICE_TREE=../devicetree/wally-virt.dtb
 
 read -p "Warning: running this script will overwrite the contents of:
   * $traceFile
@@ -36,7 +37,7 @@ then
     # QEMU Simulation
     echo "Launching QEMU in replay mode!"
     (qemu-system-riscv64 \
-    -M virt -dtb $imageDir/wally-virt.dtb \
+    -M virt -m 256M -dtb $DEVICE_TREE \
     -nographic \
     -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \
     -singlestep -rtc clock=vm -icount shift=0,align=off,sleep=on,rr=replay,rrfile=$recordFile \