diff --git a/metadata/com.metallic.chiaki.yml b/metadata/com.metallic.chiaki.yml
index 3bbb903188..4f92c38971 100644
--- a/metadata/com.metallic.chiaki.yml
+++ b/metadata/com.metallic.chiaki.yml
@@ -80,11 +80,13 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y protobuf-compiler python3-protobuf
+      - apt-get install -y build-essential protobuf-compiler python3-protobuf
     gradle:
       - yes
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
-    ndk: r20b
+    rm:
+      - third-party/nanopb/tests/fuzztest
+    prebuild: sdkmanager 'cmake;3.22.1'
+    ndk: r25b
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags