diff --git a/.gitignore b/.gitignore
index 970241189..ac0d42742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,6 +176,7 @@ integration_test/playground.dart
 
 # Monero.dart (Monero_C)
 scripts/monero_c
+scripts/android/app_env.fish
 # iOS generated framework bin
 ios/MoneroWallet.framework/MoneroWallet
 ios/WowneroWallet.framework/WowneroWallet
diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock
index d02a50e3b..76bbdcc25 100644
--- a/cw_bitcoin/pubspec.lock
+++ b/cw_bitcoin/pubspec.lock
@@ -86,16 +86,20 @@ packages:
   bitcoin_base:
     dependency: "direct overridden"
     description:
-      path: "/home/rafael/Working/bitcoin_base/"
-      relative: false
-    source: path
+      path: "."
+      ref: cake-update-v15
+      resolved-ref: "49db5748d2edc73c0c8213e11ab6a39fa3a7ff7f"
+      url: "https://github.com/cake-tech/bitcoin_base.git"
+    source: git
     version: "4.7.0"
   blockchain_utils:
     dependency: "direct main"
     description:
-      path: "/home/rafael/Working/blockchain_utils/"
-      relative: false
-    source: path
+      path: "."
+      ref: cake-update-v3
+      resolved-ref: "9b64c43bcfe129e7f01300a63607fde083dd0357"
+      url: "https://github.com/cake-tech/blockchain_utils.git"
+    source: git
     version: "3.3.0"
   bluez:
     dependency: transitive
@@ -913,9 +917,11 @@ packages:
   sp_scanner:
     dependency: "direct main"
     description:
-      path: "/home/rafael/Working/sp_scanner/"
-      relative: false
-    source: path
+      path: "."
+      ref: cake-update-v3
+      resolved-ref: "2c21e53fd652e0aee1ee5fcd891376c10334237b"
+      url: "https://github.com/cake-tech/sp_scanner.git"
+    source: git
     version: "0.0.1"
   stack_trace:
     dependency: transitive
diff --git a/cw_bitcoin/pubspec.yaml b/cw_bitcoin/pubspec.yaml
index 94ae3e046..9e69f4eb0 100644
--- a/cw_bitcoin/pubspec.yaml
+++ b/cw_bitcoin/pubspec.yaml
@@ -27,12 +27,16 @@ dependencies:
   rxdart: ^0.28.0
   cryptography: ^2.0.5
   blockchain_utils:
-    path: /home/rafael/Working/blockchain_utils/
+    git:
+      url: https://github.com/cake-tech/blockchain_utils.git
+      ref: cake-update-v3
   cw_mweb:
     path: ../cw_mweb
   grpc: ^3.2.4
   sp_scanner:
-    path: /home/rafael/Working/sp_scanner/
+    git:
+      url: https://github.com/cake-tech/sp_scanner.git
+      ref: cake-update-v3
   bech32:
     git:
       url: https://github.com/cake-tech/bech32.git
@@ -58,9 +62,13 @@ dependency_overrides:
   watcher: ^1.1.0
   protobuf: ^3.1.0
   bitcoin_base:
-    path: /home/rafael/Working/bitcoin_base/
+    git:
+      url: https://github.com/cake-tech/bitcoin_base.git
+      ref: cake-update-v15
   blockchain_utils:
-    path: /home/rafael/Working/blockchain_utils/
+    git:
+      url: https://github.com/cake-tech/blockchain_utils.git
+      ref: cake-update-v3
   pointycastle: 3.7.4
   ffi: 2.1.0
 
diff --git a/cw_bitcoin_cash/pubspec.yaml b/cw_bitcoin_cash/pubspec.yaml
index eb2eceef3..e1336d0d6 100644
--- a/cw_bitcoin_cash/pubspec.yaml
+++ b/cw_bitcoin_cash/pubspec.yaml
@@ -26,7 +26,9 @@ dependencies:
       url: https://github.com/cake-tech/bitbox-flutter.git
       ref: Add-Support-For-OP-Return-data
   blockchain_utils:
-    path: /home/rafael/Working/blockchain_utils/
+    git:
+      url: https://github.com/cake-tech/blockchain_utils.git
+      ref: cake-update-v3
 
 dev_dependencies:
   flutter_test:
@@ -38,9 +40,13 @@ dev_dependencies:
 dependency_overrides:
   watcher: ^1.1.0
   bitcoin_base:
-    path: /home/rafael/Working/bitcoin_base/
+    git:
+      url: https://github.com/cake-tech/bitcoin_base.git
+      ref: cake-update-v15
   blockchain_utils:
-    path: /home/rafael/Working/blockchain_utils/
+    git:
+      url: https://github.com/cake-tech/blockchain_utils.git
+      ref: cake-update-v3
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/cw_tron/pubspec.yaml b/cw_tron/pubspec.yaml
index 19c778135..10eb3fbda 100644
--- a/cw_tron/pubspec.yaml
+++ b/cw_tron/pubspec.yaml
@@ -16,9 +16,13 @@ dependencies:
   cw_evm:
     path: ../cw_evm
   on_chain:
-    path: /home/rafael/Working/On_chain/
+    git:
+      url: https://github.com/cake-tech/on_chain.git
+      ref: cake-update-v3
   blockchain_utils:
-    path: /home/rafael/Working/blockchain_utils/
+    git:
+      url: https://github.com/cake-tech/blockchain_utils.git
+      ref: cake-update-v3
   mobx: ^2.3.0+1
   bip39: ^1.0.6
   hive: ^2.2.3
@@ -33,7 +37,9 @@ dev_dependencies:
 
 dependency_overrides:
   blockchain_utils:
-    path: /home/rafael/Working/blockchain_utils/
+    git:
+      url: https://github.com/cake-tech/blockchain_utils.git
+      ref: cake-update-v3
 
 flutter:
   # assets:
diff --git a/pubspec_base.yaml b/pubspec_base.yaml
index 0402ba159..72c6cd6bc 100644
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@@ -132,7 +132,9 @@ dependency_overrides:
   flutter_secure_storage_platform_interface: 1.0.2
   protobuf: ^3.1.0
   bitcoin_base:
-    path: /home/rafael/Working/bitcoin_base/
+    git:
+      url: https://github.com/cake-tech/bitcoin_base.git
+      ref: cake-update-v15
   ffi: 2.1.0
 
 flutter_icons: