diff --git a/CODEOWNERS b/CODEOWNERS
index 2aabb0a3299d..1a054c4d3f6d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -694,6 +694,7 @@
 /include/zephyr/dt-bindings/usb/usb.h            @galak
 /include/zephyr/dt-bindings/adc/ads114s0x_adc.h  @benediktibk
 /include/zephyr/drivers/emul.h                   @sjg20
+/include/zephyr/data/                            @d3zd3z
 /include/zephyr/fs/                              @nashif @de-nordic
 /include/zephyr/init.h                           @nashif @andyross
 /include/zephyr/irq.h                            @dcpleung @nashif @andyross
@@ -741,6 +742,7 @@
 /lib/open-amp/                            @arnopo
 /lib/os/                                  @dcpleung @nashif @andyross
 /lib/os/cbprintf_packaged.c               @npitre
+/lib/os/json.c                            @d3zd3z
 /lib/posix/                               @cfriedt
 /lib/posix/getopt/                        @jakub-uC
 /subsys/portability/                      @nashif
@@ -864,6 +866,7 @@ scripts/build/gen_image_info.py           @tejlmand
 /subsys/fs/nvs/                           @Laczen
 /subsys/ipc/                              @carlocaione
 /subsys/ipc/ipc_service/*/*icmsg*         @emob-nordic
+/subsys/jwt/                              @d3zd3z
 /subsys/logging/                          @nordic-krch
 /subsys/logging/backends/log_backend_net.c @nordic-krch @rlubos @jukkar
 /subsys/lorawan/                          @Mani-Sadhasivam
@@ -932,6 +935,7 @@ scripts/build/gen_image_info.py           @tejlmand
 /tests/kernel/                            @dcpleung @andyross @nashif
 /tests/lib/                               @nashif
 /tests/lib/cmsis_dsp/                     @stephanosio
+/tests/lib/json/                          @d3zd3z
 /tests/net/                               @rlubos @tbursztyka @jukkar
 /tests/net/buf/                           @jhedberg @tbursztyka @jukkar
 /tests/net/conn_mgr_monitor/              @rlubos @glarsennordic @jukkar
@@ -948,6 +952,7 @@ scripts/build/gen_image_info.py           @tejlmand
 /tests/net/socket/                        @rlubos @tbursztyka @jukkar
 /tests/subsys/debug/coredump/             @dcpleung
 /tests/subsys/fs/                         @nashif @de-nordic
+/tests/subsys/jwt/                        @d3zd3z
 /tests/subsys/mgmt/mcumgr/                @de-nordic @nordicjm
 /tests/subsys/sd/                         @danieldegrasse
 /tests/subsys/rtio/                       @teburd
diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 74772a4d75be..2073c0ff2f5f 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -1597,7 +1597,9 @@ IPC:
     - "area: IPC"
 
 JSON Web Token:
-  status: odd fixes
+  status: maintained
+  maintainers:
+    - d3zd3z
   collaborators:
     - mrfuchs
     - sir-branch