diff --git a/scripts/debug_rom/debug_rom.S b/scripts/debug_rom/debug_rom.S
index 00af9f095f9..138c81b7a2f 100755
--- a/scripts/debug_rom/debug_rom.S
+++ b/scripts/debug_rom/debug_rom.S
@@ -33,7 +33,7 @@ _entry:
         // This fence is required because the execution may have written something
         // into the Abstract Data or Program Buffer registers.
         fence
-        csrw CSR_DSCRATCH, s0  // Save s0 to allow signaling MHARTID
+        csrw CSR_DSCRATCH0, s0  // Save s0 to allow signaling MHARTID
 
         // We continue to let the hart know that we are halted in order that
         // a DM which was reset is still made aware that a hart is halted.
@@ -49,7 +49,7 @@ entry_loop:
         andi s0, s0, (1 << FLAG_GO)
         beqz s0, _resume               // If GO is clear at this point, RESUME must be set.
 
-        csrr s0, CSR_DSCRATCH          // Restore s0 here
+        csrr s0, CSR_DSCRATCH0         // Restore s0 here
         sw zero, GOING(zero)           // When debug module sees this write, the GO flag is reset.
         jalr zero, zero, %lo(whereto)          // Rocket-Chip has a specific hack which is that jalr in
                                        // Debug Mode will flush the I-Cache. We need that so that the
@@ -58,7 +58,7 @@ entry_loop:
 _resume:
         csrr s0, CSR_MHARTID
         sw   s0, RESUMING(zero) // When Debug Module sees this write, the RESUME flag is reset.
-        csrr s0, CSR_DSCRATCH   // Restore s0
+        csrr s0, CSR_DSCRATCH0  // Restore s0
         dret
 
 _exception:
diff --git a/scripts/debug_rom/debug_rom_nonzero.S b/scripts/debug_rom/debug_rom_nonzero.S
index f78b8434695..8c529ed0e0d 100644
--- a/scripts/debug_rom/debug_rom_nonzero.S
+++ b/scripts/debug_rom/debug_rom_nonzero.S
@@ -3,7 +3,7 @@
 #include "riscv-pk/encoding.h"
 
 #ifndef CSR_DSCRATCH1
-#define CSR_DSCRATCH1 (CSR_DSCRATCH + 1)
+#define CSR_DSCRATCH1 (CSR_DSCRATCH0 + 1)
 #endif
   
 // These are implementation-specific addresses in the Debug Module, relative to entry
@@ -39,7 +39,7 @@ _entry:
         // This fence is required because the execution may have written something
         // into the Abstract Data or Program Buffer registers.
         fence
-        csrw  CSR_DSCRATCH, s0         // Save s0 to allow signaling MHARTID
+        csrw  CSR_DSCRATCH0, s0        // Save s0 to allow signaling MHARTID
         la    s1, entry                // s1 = base (0x800 into debug region)
 
         // We continue to let the hart know that we are halted in order that
@@ -57,7 +57,7 @@ entry_loop:
         andi  s0, s0, (1 << FLAG_GO)
         beqz  s0, _resume              // If GO is clear at this point, RESUME must be set.
 
-        csrr  s0, CSR_DSCRATCH         // Restore s0 here
+        csrr  s0, CSR_DSCRATCH0        // Restore s0 here
 
 //TODO: 0x48 is a hack for (icache-entry) constant
         jalr  zero, 0x48(s1)           // Rocket-Chip has a specific hack which is that jalr in
@@ -72,7 +72,7 @@ icache:
 _resume:
         csrr  s0, CSR_MHARTID
         sw    s0, RESUMING(s1)         // When Debug Module sees this write, the RESUME flag is reset.
-        csrr  s0, CSR_DSCRATCH         // Restore s0
+        csrr  s0, CSR_DSCRATCH0        // Restore s0
         csrr  s1, CSR_DSCRATCH1        // Restore s1
         dret