diff --git a/src/nouveau/compiler/nak_from_nir.rs b/src/nouveau/compiler/nak_from_nir.rs
index 4d5d4ab5e32..19e4f3f463a 100644
--- a/src/nouveau/compiler/nak_from_nir.rs
+++ b/src/nouveau/compiler/nak_from_nir.rs
@@ -1455,8 +1455,8 @@ impl<'a> ShaderFromNir<'a> {
                     dst: dst.into(),
                     resident: Dst::None,
                     image_dim: dim,
-                    mem_order: MemOrder::Weak,
-                    mem_scope: MemScope::CTA,
+                    mem_order: MemOrder::Strong,
+                    mem_scope: MemScope::System,
                     mask: (1 << comps) - 1,
                     handle: handle,
                     coord: coord,
@@ -1476,8 +1476,8 @@ impl<'a> ShaderFromNir<'a> {
 
                 b.push_op(OpSuSt {
                     image_dim: dim,
-                    mem_order: MemOrder::Weak,
-                    mem_scope: MemScope::CTA,
+                    mem_order: MemOrder::Strong,
+                    mem_scope: MemScope::System,
                     mask: (1 << comps) - 1,
                     handle: handle,
                     coord: coord,