diff --git a/app/src/studio/Kconfig b/app/src/studio/Kconfig
index d1315070e6d..a0608554549 100644
--- a/app/src/studio/Kconfig
+++ b/app/src/studio/Kconfig
@@ -34,6 +34,7 @@ menuconfig ZMK_STUDIO_RPC
     select NANOPB
     # These two save stack size
     imply NANOPB_NO_ERRMSG
+    imply NANOPB_NO_ENCODE_SIZE_CHECK
     imply NANOPB_WITHOUT_64BIT
     imply ZMK_STUDIO_LOCKING if !ARCH_POSIX
     select CBPRINTF_LIBC_SUBSTS if ARCH_POSIX
diff --git a/app/west.yml b/app/west.yml
index 5737bd004b1..e612ec65679 100644
--- a/app/west.yml
+++ b/app/west.yml
@@ -4,10 +4,12 @@ manifest:
       url-base: https://github.com/zephyrproject-rtos
     - name: zmkfirmware
       url-base: https://github.com/zmkfirmware
+    - name: petejohanson
+      url-base: https://github.com/petejohanson
   projects:
     - name: zephyr
-      remote: zmkfirmware
-      revision: v3.5.0+zmk-fixes
+      remote: petejohanson
+      revision: v3.5.0+zmk-use-zmk-nanopb-fork-with-stack-size-reduction
       clone-depth: 1
       import:
         name-blocklist:
@@ -30,9 +32,9 @@ manifest:
           - edtt
           - trusted-firmware-m
     - name: nanopb
-      revision: 65cbefb4695bc7af1cb733ced99618afb3586b20
+      revision: bf328175df765d05cbc0c19734af85378af0280c
       path: modules/lib/nanopb
-      remote: zephyrproject-rtos
+      remote: zmkfirmware
     - name: zmk-studio-messages
       revision: a79267a9661241a6603b6da3d2b3f71e8023a9d9
       path: modules/msgs/zmk-studio-messages