diff --git a/thermosphere/src/breakpoints_watchpoints_load.s b/thermosphere/src/breakpoints_watchpoints_load.s
index 11da1d2b0..34eb6a1f2 100644
--- a/thermosphere/src/breakpoints_watchpoints_load.s
+++ b/thermosphere/src/breakpoints_watchpoints_load.s
@@ -19,7 +19,7 @@
 // Precondition: x1 <= 16
 FUNCTION loadBreakpointRegs
     // x1 = number
-    dmb     sy
+    dmb     ish
 
     adr     x16, 1f
     add     x0, x0, #(16 * 8)
@@ -35,7 +35,7 @@ FUNCTION loadBreakpointRegs
     msr     dbgbcr\count\()_el1, x2
     msr     dbgbvr\count\()_el1, x3
     .endr
-    dsb     sy
+    dsb     ish
     isb
     ret
 END_FUNCTION
@@ -43,7 +43,7 @@ END_FUNCTION
 // Precondition: x1 <= 16
 FUNCTION loadWatchpointRegs
     // x1 = number
-    dmb     sy
+    dmb     ish
 
     adr     x16, 1f
     add     x0, x0, #(16 * 8)
@@ -59,7 +59,7 @@ FUNCTION loadWatchpointRegs
     msr     dbgwcr\count\()_el1, x2
     msr     dbgwvr\count\()_el1, x3
     .endr
-    dsb     sy
+    dsb     ish
     isb
     ret
 END_FUNCTION
diff --git a/thermosphere/src/fpu_regs_load_store.s b/thermosphere/src/fpu_regs_load_store.s
index 23e1bf921..52feb0868 100644
--- a/thermosphere/src/fpu_regs_load_store.s
+++ b/thermosphere/src/fpu_regs_load_store.s
@@ -36,23 +36,23 @@
 .endm
 
 FUNCTION fpuLoadRegistersFromStorage
-    dmb     sy
+    dmb     ish
     LDSTORE_QREGS ldp
     ldp     x1, x2, [x0]
     msr     fpsr, x1
     msr     fpcr, x2
-    dsb     sy
-    isb     sy
+    dsb     ish
+    isb     ish
     ret
 END_FUNCTION
 
 FUNCTION fpuStoreRegistersToStorage
-    dsb     sy
-    isb     sy
+    dsb     ish
+    isb     ish
     LDSTORE_QREGS stp
     mrs     x1, fpsr
     mrs     x2, fpcr
     stp     x1, x2, [x0]
-    dmb     sy
+    dmb     ish
     ret
 END_FUNCTION