diff --git a/.github/workflows/regress-imc.yml b/.github/workflows/regress-imc.yml
index d0b9ad5a..e217d340 100644
--- a/.github/workflows/regress-imc.yml
+++ b/.github/workflows/regress-imc.yml
@@ -239,7 +239,7 @@ jobs:
           sec-encoding=${{ env.SEC_ENCODING }}
 
     - name: Install najaeda
-      run: pip install najaeda==0.7.15
+      run: pip install najaeda==0.7.18
 
     - name: Generate TinyRocket edited and CSRFile SEC examples
       working-directory: ${{github.workspace}}/example
diff --git a/.github/workflows/regress-ki.yml b/.github/workflows/regress-ki.yml
index 20c5c632..4e1ff411 100644
--- a/.github/workflows/regress-ki.yml
+++ b/.github/workflows/regress-ki.yml
@@ -239,7 +239,7 @@ jobs:
           sec-encoding=${{ env.SEC_ENCODING }}
 
     - name: Install najaeda
-      run: pip install najaeda==0.7.15
+      run: pip install najaeda==0.7.18
 
     - name: Generate TinyRocket edited and CSRFile SEC examples
       working-directory: ${{github.workspace}}/example
diff --git a/.github/workflows/regress-lec.yml b/.github/workflows/regress-lec.yml
index c8489b41..9793ed50 100644
--- a/.github/workflows/regress-lec.yml
+++ b/.github/workflows/regress-lec.yml
@@ -152,7 +152,7 @@ jobs:
           regress/tinyrocket_verilog/config.yaml
 
     - name: Install najaeda
-      run: pip install najaeda==0.7.15
+      run: pip install najaeda==0.7.18
 
     - name: Execute edit.py
       working-directory: ${{github.workspace}}/example
diff --git a/.github/workflows/regress-pdr.yml b/.github/workflows/regress-pdr.yml
index cdeb52be..ac6e9c36 100644
--- a/.github/workflows/regress-pdr.yml
+++ b/.github/workflows/regress-pdr.yml
@@ -248,7 +248,7 @@ jobs:
           sec-encoding=${{ env.SEC_ENCODING }}
 
     - name: Install najaeda
-      run: pip install najaeda==0.7.15
+      run: pip install najaeda==0.7.18
 
     - name: Generate TinyRocket edited and CSRFile SEC examples
       working-directory: ${{github.workspace}}/example
diff --git a/.github/workflows/regress-sec.yml b/.github/workflows/regress-sec.yml
index a5624f52..e1de3d52 100644
--- a/.github/workflows/regress-sec.yml
+++ b/.github/workflows/regress-sec.yml
@@ -274,7 +274,7 @@ jobs:
       env:
         CASE_GENERATOR: ${{ matrix.case.generator }}
       run: |
-        pip install najaeda==0.7.15
+        pip install najaeda==0.7.18
         case "${CASE_GENERATOR}" in
           csrfile)
             python extract_tinyrocket_csrfile_sec.py
@@ -646,7 +646,7 @@ jobs:
         set -euo pipefail
         export LD_LIBRARY_PATH="${{github.workspace}}/stage/lib:${LD_LIBRARY_PATH:-}"
 
-        pip install najaeda==0.7.15
+        pip install najaeda==0.7.18
 
         cleanup_negative_edit() {
           (
diff --git a/example/tinyrocket_edited.v b/example/tinyrocket_edited.v
index 9682f94a..158b040e 100644
--- a/example/tinyrocket_edited.v
+++ b/example/tinyrocket_edited.v
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Fri Jul 17 00:15:50 2026
+// Tue Jul 28 16:36:16 2026
 // Verilog file for RocketTile
-// naja version: 0.7.15
-// Git hash: e1a649e
+// naja version: 0.7.18
+// Git hash: 03c31df
 ////////////////////////////////////////////////////////////////////////////////
 
 (* keep_hierarchy=1 *)
diff --git a/example/tinyrocket_naja.if/db_implementation.snl b/example/tinyrocket_naja.if/db_implementation.snl
index 522cccf1..405fb274 100644
Binary files a/example/tinyrocket_naja.if/db_implementation.snl and b/example/tinyrocket_naja.if/db_implementation.snl differ
diff --git a/example/tinyrocket_naja.if/snl.mf b/example/tinyrocket_naja.if/snl.mf
index 5c2ace77..119db595 100644
--- a/example/tinyrocket_naja.if/snl.mf
+++ b/example/tinyrocket_naja.if/snl.mf
@@ -1,8 +1,8 @@
 ################################################################################
-# Fri Jul 17 00:15:44 2026
+# Tue Jul 28 16:36:08 2026
 # SNL manifest
-# naja version: 0.7.15
-# Git hash: e1a649e
+# naja version: 0.7.18
+# Git hash: 03c31df
 ################################################################################
 V 0 1 0
-P 0.7.15 e1a649e
+P 0.7.18 03c31df
diff --git a/example/tinyrocket_naja_edited.if/db_implementation.snl b/example/tinyrocket_naja_edited.if/db_implementation.snl
index abb49c09..8c961e41 100644
Binary files a/example/tinyrocket_naja_edited.if/db_implementation.snl and b/example/tinyrocket_naja_edited.if/db_implementation.snl differ
diff --git a/example/tinyrocket_naja_edited.if/snl.mf b/example/tinyrocket_naja_edited.if/snl.mf
index 0b6bac96..095a47f7 100644
--- a/example/tinyrocket_naja_edited.if/snl.mf
+++ b/example/tinyrocket_naja_edited.if/snl.mf
@@ -1,8 +1,8 @@
 ################################################################################
-# Fri Jul 17 00:15:50 2026
+# Tue Jul 28 16:36:16 2026
 # SNL manifest
-# naja version: 0.7.15
-# Git hash: e1a649e
+# naja version: 0.7.18
+# Git hash: 03c31df
 ################################################################################
 V 0 1 0
-P 0.7.15 e1a649e
+P 0.7.18 03c31df
diff --git a/example/tinyrocket_sec_probe.v b/example/tinyrocket_sec_probe.v
index 84639dd5..3d1025af 100644
--- a/example/tinyrocket_sec_probe.v
+++ b/example/tinyrocket_sec_probe.v
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Fri Jul 17 00:15:51 2026
+// Tue Jul 28 16:36:17 2026
 // Verilog file for RocketTile
-// naja version: 0.7.15
-// Git hash: e1a649e
+// naja version: 0.7.18
+// Git hash: 03c31df
 ////////////////////////////////////////////////////////////////////////////////
 
 (* keep_hierarchy=1 *)
diff --git a/example/tinyrocket_sec_probe_edited.v b/example/tinyrocket_sec_probe_edited.v
index 0382e699..e61c1b4e 100644
--- a/example/tinyrocket_sec_probe_edited.v
+++ b/example/tinyrocket_sec_probe_edited.v
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Fri Jul 17 00:15:51 2026
+// Tue Jul 28 16:36:17 2026
 // Verilog file for RocketTile
-// naja version: 0.7.15
-// Git hash: e1a649e
+// naja version: 0.7.18
+// Git hash: 03c31df
 ////////////////////////////////////////////////////////////////////////////////
 
 (* keep_hierarchy=1 *)
diff --git a/example/tinyrocket_sec_probe_naja.if/db_implementation.snl b/example/tinyrocket_sec_probe_naja.if/db_implementation.snl
index b6d9b2db..a0d49031 100644
Binary files a/example/tinyrocket_sec_probe_naja.if/db_implementation.snl and b/example/tinyrocket_sec_probe_naja.if/db_implementation.snl differ
diff --git a/example/tinyrocket_sec_probe_naja.if/snl.mf b/example/tinyrocket_sec_probe_naja.if/snl.mf
index d6889201..fd3b6052 100644
--- a/example/tinyrocket_sec_probe_naja.if/snl.mf
+++ b/example/tinyrocket_sec_probe_naja.if/snl.mf
@@ -1,8 +1,8 @@
 ################################################################################
-# Fri Jul 17 00:15:51 2026
+# Tue Jul 28 16:36:17 2026
 # SNL manifest
-# naja version: 0.7.15
-# Git hash: e1a649e
+# naja version: 0.7.18
+# Git hash: 03c31df
 ################################################################################
 V 0 1 0
-P 0.7.15 e1a649e
+P 0.7.18 03c31df
diff --git a/example/tinyrocket_sec_probe_naja_edited.if/db_implementation.snl b/example/tinyrocket_sec_probe_naja_edited.if/db_implementation.snl
index 27e11a8b..f55d6a0d 100644
Binary files a/example/tinyrocket_sec_probe_naja_edited.if/db_implementation.snl and b/example/tinyrocket_sec_probe_naja_edited.if/db_implementation.snl differ
diff --git a/example/tinyrocket_sec_probe_naja_edited.if/snl.mf b/example/tinyrocket_sec_probe_naja_edited.if/snl.mf
index d6889201..fd3b6052 100644
--- a/example/tinyrocket_sec_probe_naja_edited.if/snl.mf
+++ b/example/tinyrocket_sec_probe_naja_edited.if/snl.mf
@@ -1,8 +1,8 @@
 ################################################################################
-# Fri Jul 17 00:15:51 2026
+# Tue Jul 28 16:36:17 2026
 # SNL manifest
-# naja version: 0.7.15
-# Git hash: e1a649e
+# naja version: 0.7.18
+# Git hash: 03c31df
 ################################################################################
 V 0 1 0
-P 0.7.15 e1a649e
+P 0.7.18 03c31df
diff --git a/thirdparty/naja b/thirdparty/naja
index e1a649e2..03c31df7 160000
--- a/thirdparty/naja
+++ b/thirdparty/naja
@@ -1 +1 @@
-Subproject commit e1a649e2fce182d8b7ca5c5c80ab5d04aad3ffa3
+Subproject commit 03c31df751c2e5f039098560d075fc00578d0a4d