diff --git a/Dockerfile b/Dockerfile
index a4a0c19c8..9fa20c919 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,6 +45,8 @@ RUN apt-get update \
 RUN set -o xtrace \
     && cd /opt \
     && apt-get install -y --no-install-recommends --no-install-suggests \
+    # protobuf
+    protobuf-compiler libprotobuf-dev \
     # Core dependencies
     bc build-essential curl default-jdk git jq lcov libglu1-mesa libpulse0 libsqlite3-dev libstdc++6 locales openssh-client ruby-bundler ruby-full sudo unzip wget zip \
     # for x86 emulators
@@ -88,11 +90,11 @@ ENV GOROOT=/usr/local/go
 ENV GOPATH=${HOME}/go
 RUN ARCH=$(uname -m) && \
     if [ "$ARCH" = "x86_64" ]; then \
-      wget https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz -O go.tar.gz; \
+    wget https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz -O go.tar.gz; \
     elif [ "$ARCH" = "aarch64" ]; then \
-      wget https://go.dev/dl/go${GOLANG_VERSION}.linux-arm64.tar.gz -O go.tar.gz; \
+    wget https://go.dev/dl/go${GOLANG_VERSION}.linux-arm64.tar.gz -O go.tar.gz; \
     else \
-      echo "Unsupported architecture: $ARCH"; exit 1; \
+    echo "Unsupported architecture: $ARCH"; exit 1; \
     fi && \
     rm -rf /usr/local/go && \
     tar -C /usr/local -xzf go.tar.gz && \
@@ -144,6 +146,10 @@ RUN ARCH=$(uname -m) && \
 
 # Install extra NDK dependency for sp_scanner
 ENV ANDROID_NDK_VERSION=28.2.13676358
+
+ENV ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION
+ENV ANDROID_NDK=$ANDROID_NDK_HOME
+
 RUN ARCH=$(uname -m) && \
     if [ "$ARCH" != "x86_64" ]; then exit 0; fi \
     && yes | sdkmanager "ndk;$ANDROID_NDK_VERSION"
@@ -172,7 +178,7 @@ RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
     do \
     for target in aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu; \
     do \
-        rustup target add --toolchain $toolchain $target; \
+    rustup target add --toolchain $toolchain $target; \
     done \
     done
 
diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock
index 31b74aeb6..95195d53c 100644
--- a/cw_bitcoin/pubspec.lock
+++ b/cw_bitcoin/pubspec.lock
@@ -410,10 +410,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_rust_bridge
-      sha256: "5a5c7a5deeef2cc2ffe6076a33b0429f4a20ceac22a397297aed2b1eb067e611"
+      sha256: "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.0"
+    version: "2.11.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -791,8 +791,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: cake-v3
-      resolved-ref: "15d64407dd17a63258cd0fdada1e39a16041dd74"
+      ref: b28c825b1d63381e8c2b25ef2ccabacbf833ce53
+      resolved-ref: b28c825b1d63381e8c2b25ef2ccabacbf833ce53
       url: "https://github.com/konstantinullrich/payjoin-flutter"
     source: git
     version: "0.23.0"
diff --git a/docs/builds/ANDROID.md b/docs/builds/ANDROID.md
index d598c07ef..4964cfec6 100644
--- a/docs/builds/ANDROID.md
+++ b/docs/builds/ANDROID.md
@@ -21,14 +21,20 @@ cd cake_wallet
 # docker build -t ghcr.io/cake-tech/cake_wallet:debian13-flutter3.32.0-ndkr28-go1.24.1-ruststablenightly . # Uncomment to build the docker image yourself instead of pulling it from the registry
 docker run -v$(pwd):$(pwd) -w $(pwd) -i --rm ghcr.io/cake-tech/cake_wallet:debian13-flutter3.32.0-ndkr28-go1.24.1-ruststablenightly bash -x << EOF
 set -x -e
+git config --global --add safe.directory '*'
 pushd scripts/android
-    ./build_torch.sh
+    ./build_torch.sh # optional: this will fail on case-insensitive fs and will add extra few hours to the build process, without this embedded tor will not work.
+    ./build_reown_deps.sh
+    pushd ..
+        ./build_bitbox_flutter.sh
+    popd
     source ./app_env.sh cakewallet
     # source ./app_env.sh monero.com # Uncomment this line to build monero.com
     ./app_config.sh
-    ./build_monero_all.sh
+    ./build_monero_all.sh # optional, ommit to not build monero
     ./build_decred.sh
     ./build_mwebd.sh
+    ./build_zcash.sh
 popd
 pushd android/app
     [[ -f key.jks ]] || keytool -genkey -v -keystore key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias testKey -noprompt -dname "CN=CakeWallet, OU=CakeWallet, O=CakeWallet, L=Florida, S=America, C=USA" -storepass hunter1 -keypass hunter1
diff --git a/docs/builds/LINUX.md b/docs/builds/LINUX.md
index e7e94ed66..e808fd5fd 100644
--- a/docs/builds/LINUX.md
+++ b/docs/builds/LINUX.md
@@ -25,12 +25,18 @@ docker run --privileged -v$(pwd):$(pwd) -w $(pwd) -i --rm ghcr.io/cake-tech/cake
 set -x -e
 pushd scripts
     ./gen_android_manifest.sh
+    ./prepare_moneroc.sh
+    ./prepare_torch.sh
+    ./prepare_zcash.sh
+    ./prepare_reown.sh
+    ./build_bitbox_flutter.sh
 popd
 pushd scripts/linux
+    ./build_monero_all.sh
+    ./build_zcash.sh
     source ./app_env.sh cakewallet
     # source ./app_env.sh monero.com # Uncomment this line to build monero.com
     ./app_config.sh
-    ./build_monero_all.sh
 popd
 flutter clean
 ./model_generator.sh