diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index dc767a55d..dfd0d315a 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cakewallet.cake_wallet">
+    package="com.monero.app">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index b82513de2..f83e18c40 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -106,7 +106,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
-  cw_monero: ec03de55a19c4a2b174ea687e0f4202edc716fa4
+  cw_monero: f8b7f104508efba2591548e76b5c058d05cba3f0
   device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
   devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
   flutter_inappwebview_macos: 9600c9df9fdb346aaa8933812009f8d94304203d
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index 911fa9fcc..7bf0cd5e8 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -59,7 +59,7 @@
 		2A820A13B0719E9E0CD6686F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
-		33CC10ED2044A3C60003C045 /* Cake Wallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Cake Wallet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		33CC10ED2044A3C60003C045 /* Monero.com.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Monero.com.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
 		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -116,7 +116,7 @@
 		33CC10EE2044A3C60003C045 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				33CC10ED2044A3C60003C045 /* Cake Wallet.app */,
+				33CC10ED2044A3C60003C045 /* Monero.com.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -197,7 +197,7 @@
 			);
 			name = Runner;
 			productName = Runner;
-			productReference = 33CC10ED2044A3C60003C045 /* Cake Wallet.app */;
+			productReference = 33CC10ED2044A3C60003C045 /* Monero.com.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -421,15 +421,14 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
+				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 10;
-				DEVELOPMENT_TEAM = 32J6BB6VUS;
+				DEVELOPMENT_TEAM = X7J2Z37ZUL;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Cake Wallet";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
@@ -555,15 +554,14 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
+				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 10;
-				DEVELOPMENT_TEAM = 32J6BB6VUS;
+				DEVELOPMENT_TEAM = X7J2Z37ZUL;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Cake Wallet";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
@@ -583,15 +581,14 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
+				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 10;
-				DEVELOPMENT_TEAM = 32J6BB6VUS;
+				DEVELOPMENT_TEAM = X7J2Z37ZUL;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Cake Wallet";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 8536e9a81..1f89f6835 100644
--- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-               BuildableName = "Cake Wallet.app"
+               BuildableName = "Monero.com.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "Cake Wallet.app"
+            BuildableName = "Monero.com.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -54,7 +54,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "Cake Wallet.app"
+            BuildableName = "Monero.com.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -71,7 +71,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "Cake Wallet.app"
+            BuildableName = "Monero.com.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
diff --git a/scripts/android/build_openssl.sh b/scripts/android/build_openssl.sh
index aa668e6bf..b67479464 100755
--- a/scripts/android/build_openssl.sh
+++ b/scripts/android/build_openssl.sh
@@ -24,9 +24,8 @@ echo $OPENSSL_SHA256 $OPENSSL_FILE_PATH | sha256sum -c - || exit 1
 for arch in "aarch" "aarch64" "i686" "x86_64"
 do
 PREFIX=$WORKDIR/prefix_${arch}
-TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
+TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64
 PATH="${TOOLCHAIN}/bin:${ORIGINAL_PATH}"
-
 case $arch in
 	"aarch")   X_ARCH="android-arm";;
 	"aarch64") X_ARCH="android-arm64";;
diff --git a/scripts/android/build_unbound.sh b/scripts/android/build_unbound.sh
index 8786b0f2b..fe3549f07 100755
--- a/scripts/android/build_unbound.sh
+++ b/scripts/android/build_unbound.sh
@@ -9,12 +9,12 @@ EXPAT_SRC_DIR=$WORKDIR/libexpat
 for arch in "aarch" "aarch64" "i686" "x86_64"
 do
 PREFIX=$WORKDIR/prefix_${arch}
-TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
+TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64
 PATH="${TOOLCHAIN_BASE_DIR}_${arch}/bin:${ORIGINAL_PATH}"
 
 cd $WORKDIR
 rm -rf $EXPAT_SRC_DIR
-git clone https://github.com/libexpat/libexpat.git -b ${EXPAT_VERSION} ${EXPAT_SRC_DIR}
+git clone https://github.com/libexpat/libexpat.git --depth=1 -b ${EXPAT_VERSION} ${EXPAT_SRC_DIR}
 cd $EXPAT_SRC_DIR
 test `git rev-parse HEAD` = ${EXPAT_HASH} || exit 1
 cd $EXPAT_SRC_DIR/expat
@@ -38,7 +38,7 @@ UNBOUND_SRC_DIR=$WORKDIR/unbound-1.16.2
 for arch in "aarch" "aarch64" "i686" "x86_64"
 do
 PREFIX=$WORKDIR/prefix_${arch}
-TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
+TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64
 
 case $arch in
 	"aarch")   TOOLCHAIN_BIN_PATH=${TOOLCHAIN_BASE_DIR}_${arch}/arm-linux-androideabi/bin;;
@@ -49,7 +49,7 @@ PATH="${TOOLCHAIN_BIN_PATH}:${TOOLCHAIN_BASE_DIR}_${arch}/bin:${ORIGINAL_PATH}"
 echo $PATH
 cd $WORKDIR
 rm -rf $UNBOUND_SRC_DIR
-git clone https://github.com/NLnetLabs/unbound.git -b ${UNBOUND_VERSION} ${UNBOUND_SRC_DIR}
+git clone https://github.com/NLnetLabs/unbound.git --depth=1 -b ${UNBOUND_VERSION} ${UNBOUND_SRC_DIR}
 cd $UNBOUND_SRC_DIR
 test `git rev-parse HEAD` = ${UNBOUND_HASH} || exit 1
 
diff --git a/scripts/android/init_boost.sh b/scripts/android/init_boost.sh
index 13120c910..7579acdd7 100755
--- a/scripts/android/init_boost.sh
+++ b/scripts/android/init_boost.sh
@@ -17,6 +17,6 @@ echo $BOOST_SHA256 $BOOST_FILE_PATH | sha256sum -c - || exit 1
 cd $WORKDIR
 rm -rf $BOOST_SRC_DIR
 rm -rf $PREFIX/include/boost
-tar -xvf $BOOST_FILE_PATH -C $WORKDIR
+tar -xf $BOOST_FILE_PATH -C $WORKDIR
 cd $BOOST_SRC_DIR
-./bootstrap.sh --prefix=${PREFIX}
+./bootstrap.sh --prefix=${PREFIX} --with-toolset=gcc
diff --git a/scripts/android/inject_app_details.sh b/scripts/android/inject_app_details.sh
index 27b7efa39..3e6e2915d 100755
--- a/scripts/android/inject_app_details.sh
+++ b/scripts/android/inject_app_details.sh
@@ -6,6 +6,7 @@ if [ -z "$APP_ANDROID_TYPE" ]; then
 fi
 
 cd ../..
+set -x
 sed -i "0,/version:/{s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/}" ./pubspec.yaml 
 sed -i "0,/version:/{s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/}" ./android/app/src/main/AndroidManifest.xml
 sed -i "0,/__APP_SCHEME__/s/__APP_SCHEME__/${APP_ANDROID_SCHEME}/" ./android/app/src/main/AndroidManifest.xml
diff --git a/scripts/android/install_ndk.sh b/scripts/android/install_ndk.sh
index bee72abad..4ec794371 100755
--- a/scripts/android/install_ndk.sh
+++ b/scripts/android/install_ndk.sh
@@ -8,9 +8,9 @@ TOOLCHAIN_x86_DIR=${TOOLCHAIN_DIR}_i686
 TOOLCHAIN_x86_64_DIR=${TOOLCHAIN_DIR}_x86_64
 ANDROID_NDK_SHA256="3f541adbd0330a9205ba12697f6d04ec90752c53d6b622101a2a8a856e816589"
 
-curl https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip -o ${ANDROID_NDK_ZIP}
-echo $ANDROID_NDK_SHA256 $ANDROID_NDK_ZIP | sha256sum -c || exit 1
-unzip $ANDROID_NDK_ZIP -d $WORKDIR
+# curl https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip -o ${ANDROID_NDK_ZIP}
+# echo $ANDROID_NDK_SHA256 $ANDROID_NDK_ZIP | sha256sum -c || exit 1
+# unzip $ANDROID_NDK_ZIP -d $WORKDIR
 
 ${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch arm64 --api $API --install-dir ${TOOLCHAIN_A64_DIR} --stl=libc++
 ${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch arm --api $API --install-dir ${TOOLCHAIN_A32_DIR} --stl=libc++
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
old mode 100644
new mode 100755
index eef09a323..1bcb0464e
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -4,23 +4,57 @@ LABEL authors="konsti"
 ENV MONERO_BRANCH=release-v0.18.2.2-android
 RUN apt-get update && \
     echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
-    apt-get install -y dialog apt-utils curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang
+    apt-get install -y dialog apt-utils curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang bison
 
 RUN mkdir /opt/android/
 
-COPY . /opt/android/cakewallet/
-
 WORKDIR /opt/android/cakewallet/
 
+# build_all.sh
+# build_boost.sh
+# build_haven.sh
+# build_haven_all.sh
+# build_iconv.sh
+# build_monero.sh
+# build_openssl.sh
+# build_sodium.sh
+# build_unbound.sh
+# build_zmq.sh
+# config.sh
+# copy_haven_deps.sh
+# copy_monero_deps.sh
+# docker-compose.yml
+# entrypoint.sh
+# finish_boost.sh
+# init_boost.sh
+# install_ndk.sh
 
+COPY config.sh /opt/android/cakewallet/
+COPY install_ndk.sh /opt/android/cakewallet/
 RUN ./install_ndk.sh
 
+COPY build_iconv.sh /opt/android/cakewallet/
 RUN ./build_iconv.sh
+
+COPY build_boost.sh /opt/android/cakewallet/
+COPY init_boost.sh /opt/android/cakewallet/
+COPY finish_boost.sh /opt/android/cakewallet/
 RUN ./build_boost.sh
+
+COPY build_openssl.sh /opt/android/cakewallet/
 RUN ./build_openssl.sh
+
+COPY build_sodium.sh /opt/android/cakewallet/
 RUN ./build_sodium.sh
+
+COPY build_unbound.sh /opt/android/cakewallet/
 RUN ./build_unbound.sh
+
+COPY build_zmq.sh /opt/android/cakewallet/
 RUN ./build_zmq.sh
 
+COPY entrypoint.sh /opt/android/cakewallet/
+COPY build_monero.sh /opt/android/cakewallet/
+COPY copy_monero_deps.sh /opt/android/cakewallet/
 
 ENTRYPOINT ["./entrypoint.sh"]
diff --git a/scripts/docker/build_all.sh b/scripts/docker/build_all.sh
old mode 100644
new mode 100755
index 0acb7fcde..a4163c3f4
--- a/scripts/docker/build_all.sh
+++ b/scripts/docker/build_all.sh
@@ -1 +1,17 @@
-#!/bin/sh

if [ -z "$APP_ANDROID_TYPE" ]; then
	echo "Please set APP_ANDROID_TYPE"
	exit 1
fi

DIR=$(dirname "$0")

case $APP_ANDROID_TYPE in
	"monero.com") $DIR/build_monero_all.sh ;;
	"cakewallet") $DIR/build_monero_all.sh
				  $DIR/build_haven.sh ;;
	"haven")      $DIR/build_haven_all.sh ;;
esac
\ No newline at end of file
+#!/bin/sh
+
+set -x -e
+
+if [ -z "$APP_ANDROID_TYPE" ]; then
+	echo "Please set APP_ANDROID_TYPE"
+	exit 1
+fi
+
+DIR=$(dirname "$0")
+
+case $APP_ANDROID_TYPE in
+	"monero.com") $DIR/build_monero_all.sh ;;
+	"cakewallet") $DIR/build_monero_all.sh
+				  $DIR/build_haven.sh ;;
+	"haven")      $DIR/build_haven_all.sh ;;
+esac
diff --git a/scripts/docker/build_boost.sh b/scripts/docker/build_boost.sh
old mode 100644
new mode 100755
index 2c98afab5..97333bbee
--- a/scripts/docker/build_boost.sh
+++ b/scripts/docker/build_boost.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -x -e
 . ./config.sh
 BOOST_SRC_DIR=$WORKDIR/boost_1_72_0
 BOOST_FILENAME=boost_1_72_0.tar.bz2
diff --git a/scripts/docker/build_haven.sh b/scripts/docker/build_haven.sh
old mode 100644
new mode 100755
index 7927c5102..1dc4a6cfd
--- a/scripts/docker/build_haven.sh
+++ b/scripts/docker/build_haven.sh
@@ -1 +1,71 @@
-#!/bin/sh

. ./config.sh
HAVEN_VERSION=tags/v3.0.7
HAVEN_SRC_DIR=${WORKDIR}/haven

git clone https://github.com/haven-protocol-org/haven-main.git ${HAVEN_SRC_DIR}
git checkout ${HAVEN_VERSION}
cd $HAVEN_SRC_DIR
git submodule init
git submodule update

for arch in "aarch" "aarch64" "i686" "x86_64"
do
FLAGS=""
PREFIX=${WORKDIR}/prefix_${arch}
DEST_LIB_DIR=${PREFIX}/lib/haven
DEST_INCLUDE_DIR=${PREFIX}/include/haven
export CMAKE_INCLUDE_PATH="${PREFIX}/include"
export CMAKE_LIBRARY_PATH="${PREFIX}/lib"
ANDROID_STANDALONE_TOOLCHAIN_PATH="${TOOLCHAIN_BASE_DIR}_${arch}"
PATH="${ANDROID_STANDALONE_TOOLCHAIN_PATH}/bin:${ORIGINAL_PATH}"

mkdir -p $DEST_LIB_DIR
mkdir -p $DEST_INCLUDE_DIR

case $arch in
	"aarch"	)
		CLANG=arm-linux-androideabi-clang
 		CXXLANG=arm-linux-androideabi-clang++
		BUILD_64=OFF
		TAG="android-armv7"
		ARCH="armv7-a"
		ARCH_ABI="armeabi-v7a"
		FLAGS="-D CMAKE_ANDROID_ARM_MODE=ON -D NO_AES=true";;
	"aarch64"	)
		CLANG=aarch64-linux-androideabi-clang
 		CXXLANG=aarch64-linux-androideabi-clang++
		BUILD_64=ON
		TAG="android-armv8"
		ARCH="armv8-a"
		ARCH_ABI="arm64-v8a";;
	"i686"		)
		CLANG=i686-linux-androideabi-clang
 		CXXLANG=i686-linux-androideabi-clang++
		BUILD_64=OFF
		TAG="android-x86"
		ARCH="i686"
		ARCH_ABI="x86";;
	"x86_64"	)  
		CLANG=x86_64-linux-androideabi-clang
 		CXXLANG=x86_64-linux-androideabi-clang++
		BUILD_64=ON
		TAG="android-x86_64"
		ARCH="x86-64"
		ARCH_ABI="x86_64";;
esac

cd $HAVEN_SRC_DIR
rm -rf ./build/release
mkdir -p ./build/release
cd ./build/release
CC=${CLANG} CXX=${CXXLANG} cmake -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH=${ARCH} -D STATIC=ON -D BUILD_64=${BUILD_64} -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG=${TAG} -D CMAKE_SYSTEM_NAME="Android" -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${ANDROID_STANDALONE_TOOLCHAIN_PATH}" -D CMAKE_ANDROID_ARCH_ABI=${ARCH_ABI} $FLAGS ../..
    
make wallet_api -j$THREADS
find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \;

cp -r ./lib/* $DEST_LIB_DIR
cp ../../src/wallet/api/wallet2_api.h  $DEST_INCLUDE_DIR
done
\ No newline at end of file
+#!/bin/sh
+set -x -e
+
+. ./config.sh
+HAVEN_VERSION=tags/v3.0.7
+HAVEN_SRC_DIR=${WORKDIR}/haven
+
+git clone https://github.com/haven-protocol-org/haven-main.git ${HAVEN_SRC_DIR}
+git checkout ${HAVEN_VERSION}
+cd $HAVEN_SRC_DIR
+git submodule init
+git submodule update
+
+for arch in "aarch" "aarch64" "i686" "x86_64"
+do
+FLAGS=""
+PREFIX=${WORKDIR}/prefix_${arch}
+DEST_LIB_DIR=${PREFIX}/lib/haven
+DEST_INCLUDE_DIR=${PREFIX}/include/haven
+export CMAKE_INCLUDE_PATH="${PREFIX}/include"
+export CMAKE_LIBRARY_PATH="${PREFIX}/lib"
+ANDROID_STANDALONE_TOOLCHAIN_PATH="${TOOLCHAIN_BASE_DIR}_${arch}"
+PATH="${ANDROID_STANDALONE_TOOLCHAIN_PATH}/bin:${ORIGINAL_PATH}"
+
+mkdir -p $DEST_LIB_DIR
+mkdir -p $DEST_INCLUDE_DIR
+
+case $arch in
+	"aarch"	)
+		CLANG=arm-linux-androideabi-clang
+ 		CXXLANG=arm-linux-androideabi-clang++
+		BUILD_64=OFF
+		TAG="android-armv7"
+		ARCH="armv7-a"
+		ARCH_ABI="armeabi-v7a"
+		FLAGS="-D CMAKE_ANDROID_ARM_MODE=ON -D NO_AES=true";;
+	"aarch64"	)
+		CLANG=aarch64-linux-androideabi-clang
+ 		CXXLANG=aarch64-linux-androideabi-clang++
+		BUILD_64=ON
+		TAG="android-armv8"
+		ARCH="armv8-a"
+		ARCH_ABI="arm64-v8a";;
+	"i686"		)
+		CLANG=i686-linux-androideabi-clang
+ 		CXXLANG=i686-linux-androideabi-clang++
+		BUILD_64=OFF
+		TAG="android-x86"
+		ARCH="i686"
+		ARCH_ABI="x86";;
+	"x86_64"	)  
+		CLANG=x86_64-linux-androideabi-clang
+ 		CXXLANG=x86_64-linux-androideabi-clang++
+		BUILD_64=ON
+		TAG="android-x86_64"
+		ARCH="x86-64"
+		ARCH_ABI="x86_64";;
+esac
+
+cd $HAVEN_SRC_DIR
+rm -rf ./build/release
+mkdir -p ./build/release
+cd ./build/release
+CC=${CLANG} CXX=${CXXLANG} cmake -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH=${ARCH} -D STATIC=ON -D BUILD_64=${BUILD_64} -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG=${TAG} -D CMAKE_SYSTEM_NAME="Android" -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${ANDROID_STANDALONE_TOOLCHAIN_PATH}" -D CMAKE_ANDROID_ARCH_ABI=${ARCH_ABI} $FLAGS ../..
+    
+make wallet_api -j$THREADS
+find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \;
+
+cp -r ./lib/* $DEST_LIB_DIR
+cp ../../src/wallet/api/wallet2_api.h  $DEST_INCLUDE_DIR
+done
diff --git a/scripts/docker/build_haven_all.sh b/scripts/docker/build_haven_all.sh
old mode 100644
new mode 100755
index 4b33ad077..ce8eb3f0e
--- a/scripts/docker/build_haven_all.sh
+++ b/scripts/docker/build_haven_all.sh
@@ -1 +1,9 @@
-#!/bin/bash

./build_iconv.sh
./build_boost.sh
./build_openssl.sh
./build_sodium.sh
./build_zmq.sh
./build_haven.sh
\ No newline at end of file
+#!/bin/bash
+set -x -e
+
+./build_iconv.sh
+./build_boost.sh
+./build_openssl.sh
+./build_sodium.sh
+./build_zmq.sh
+./build_haven.sh
diff --git a/scripts/docker/build_iconv.sh b/scripts/docker/build_iconv.sh
old mode 100644
new mode 100755
index 9edac26b3..e55686fec
--- a/scripts/docker/build_iconv.sh
+++ b/scripts/docker/build_iconv.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 . ./config.sh
 export ICONV_FILENAME=libiconv-1.16.tar.gz
diff --git a/scripts/docker/build_monero.sh b/scripts/docker/build_monero.sh
old mode 100644
new mode 100755
index d663f5288..04162f0f8
--- a/scripts/docker/build_monero.sh
+++ b/scripts/docker/build_monero.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 . ./config.sh
 
diff --git a/scripts/docker/build_openssl.sh b/scripts/docker/build_openssl.sh
old mode 100644
new mode 100755
index 685d0a1be..233e64a7c
--- a/scripts/docker/build_openssl.sh
+++ b/scripts/docker/build_openssl.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 set -e
 
diff --git a/scripts/docker/build_sodium.sh b/scripts/docker/build_sodium.sh
old mode 100644
new mode 100755
index a934d641b..c911814d9
--- a/scripts/docker/build_sodium.sh
+++ b/scripts/docker/build_sodium.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 . ./config.sh
 SODIUM_SRC_DIR=${WORKDIR}/libsodium
diff --git a/scripts/docker/build_unbound.sh b/scripts/docker/build_unbound.sh
old mode 100644
new mode 100755
index 8786b0f2b..2d1efdea2
--- a/scripts/docker/build_unbound.sh
+++ b/scripts/docker/build_unbound.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
+set -x -e
 
 . ./config.sh
-
 EXPAT_VERSION=R_2_4_8
 EXPAT_HASH="3bab6c09bbe8bf42d84b81563ddbcf4cca4be838"
 EXPAT_SRC_DIR=$WORKDIR/libexpat
diff --git a/scripts/docker/build_zmq.sh b/scripts/docker/build_zmq.sh
old mode 100644
new mode 100755
index bbff9e41b..19bb99172
--- a/scripts/docker/build_zmq.sh
+++ b/scripts/docker/build_zmq.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 . ./config.sh
 ZMQ_SRC_DIR=$WORKDIR/libzmq
diff --git a/scripts/docker/config.sh b/scripts/docker/config.sh
old mode 100644
new mode 100755
index c5067f2c3..a9b691688
--- a/scripts/docker/config.sh
+++ b/scripts/docker/config.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 export API=21
 export WORKDIR=/opt/android
diff --git a/scripts/docker/copy_haven_deps.sh b/scripts/docker/copy_haven_deps.sh
old mode 100644
new mode 100755
index d59e9d7f0..5be7a1bb6
--- a/scripts/docker/copy_haven_deps.sh
+++ b/scripts/docker/copy_haven_deps.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 WORKDIR=/opt/android
 CW_DIR=${WORKDIR}/cake_wallet
diff --git a/scripts/docker/copy_monero_deps.sh b/scripts/docker/copy_monero_deps.sh
old mode 100644
new mode 100755
index e4392186c..611fedd01
--- a/scripts/docker/copy_monero_deps.sh
+++ b/scripts/docker/copy_monero_deps.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 WORKDIR=/opt/android
 CW_EXRTERNAL_DIR=${WORKDIR}/output/android
diff --git a/scripts/docker/docker-compose.yml b/scripts/docker/docker-compose.yml
old mode 100644
new mode 100755
diff --git a/scripts/docker/entrypoint.sh b/scripts/docker/entrypoint.sh
old mode 100644
new mode 100755
index e4bdc017c..84f106145
--- a/scripts/docker/entrypoint.sh
+++ b/scripts/docker/entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 ./build_monero.sh
 ./copy_monero_deps.sh
diff --git a/scripts/docker/finish_boost.sh b/scripts/docker/finish_boost.sh
old mode 100644
new mode 100755
index e3f195276..774c65d77
--- a/scripts/docker/finish_boost.sh
+++ b/scripts/docker/finish_boost.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 ARCH=$1
 PREFIX=$2
diff --git a/scripts/docker/init_boost.sh b/scripts/docker/init_boost.sh
old mode 100644
new mode 100755
index ffb7a1416..068647e1f
--- a/scripts/docker/init_boost.sh
+++ b/scripts/docker/init_boost.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -x -e
+
 
 ARCH=$1
 PREFIX=$2
@@ -17,6 +19,6 @@ echo $BOOST_SHA256 $BOOST_FILE_PATH | sha256sum -c - || exit 1
 cd $WORKDIR
 rm -rf $BOOST_SRC_DIR
 rm -rf $PREFIX/include/boost
-tar -xvf $BOOST_FILE_PATH -C $WORKDIR
+tar -xf $BOOST_FILE_PATH -C $WORKDIR
 cd $BOOST_SRC_DIR
-./bootstrap.sh --prefix=${PREFIX}
+./bootstrap.sh --prefix=${PREFIX} --with-toolset=gcc
diff --git a/scripts/docker/install_ndk.sh b/scripts/docker/install_ndk.sh
old mode 100644
new mode 100755
index 5f97751e3..94373954c
--- a/scripts/docker/install_ndk.sh
+++ b/scripts/docker/install_ndk.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x -e
 
 . ./config.sh
 TOOLCHAIN_DIR=${WORKDIR}/toolchain