diff --git a/src/panfrost/midgard/nir_fuse_io_16.c b/src/panfrost/midgard/nir_fuse_io_16.c
index 88434443e4d..3519aef86ab 100644
--- a/src/panfrost/midgard/nir_fuse_io_16.c
+++ b/src/panfrost/midgard/nir_fuse_io_16.c
@@ -81,8 +81,7 @@ nir_fuse_io_16(nir_shader *shader)
 
             intr->dest.ssa.bit_size = 16;
 
-            nir_builder b = nir_builder_create(impl);
-            b.cursor = nir_after_instr(instr);
+            nir_builder b = nir_builder_at(nir_after_instr(instr));
 
             /* The f2f32(f2fmp(x)) will cancel by opt_algebraic */
             nir_ssa_def *conv = nir_f2f32(&b, &intr->dest.ssa);
diff --git a/src/panfrost/util/pan_lower_writeout.c b/src/panfrost/util/pan_lower_writeout.c
index dd7a33304a1..843442a9329 100644
--- a/src/panfrost/util/pan_lower_writeout.c
+++ b/src/panfrost/util/pan_lower_writeout.c
@@ -151,8 +151,8 @@ pan_nir_lower_zs_store(nir_shader *nir)
 
             assert(nir_src_is_const(intr->src[1]) && "no indirect outputs");
 
-            nir_builder b = nir_builder_create(impl);
-            b.cursor = nir_after_block_before_jump(instr->block);
+            nir_builder b =
+               nir_builder_at(nir_after_block_before_jump(instr->block));
 
             /* Trying to write depth twice results in the
              * wrong blend shader being executed on
@@ -169,8 +169,8 @@ pan_nir_lower_zs_store(nir_shader *nir)
 
       /* Insert a store to the depth RT (0xff) if needed */
       if (!replaced) {
-         nir_builder b = nir_builder_create(impl);
-         b.cursor = nir_after_block_before_jump(common_block);
+         nir_builder b =
+            nir_builder_at(nir_after_block_before_jump(common_block));
 
          pan_nir_emit_combined_store(&b, NULL, writeout, stores);
       }