diff --git a/scripts/android/build_all.sh b/scripts/android/build_all.sh
index 208a4f9ef..271001dac 100755
--- a/scripts/android/build_all.sh
+++ b/scripts/android/build_all.sh
@@ -1,8 +1,14 @@
-# /bin/bash
+#!/bin/sh
 
-./build_iconv.sh
-./build_boost.sh
-./build_openssl.sh
-./build_sodium.sh
-./build_zmq.sh
-./build_monero.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 ;;
+	"haven")      $DIR/build_haven_all.sh ;;
+esac
diff --git a/scripts/android/build_haven_all.sh b/scripts/android/build_haven_all.sh
new file mode 100755
index 000000000..d004c7ebf
--- /dev/null
+++ b/scripts/android/build_haven_all.sh
@@ -0,0 +1,8 @@
+# /bin/bash
+
+./build_iconv.sh
+./build_boost.sh
+./build_openssl.sh
+./build_sodium.sh
+./build_zmq.sh
+./build_haven.sh
diff --git a/scripts/android/build_monero_all.sh b/scripts/android/build_monero_all.sh
new file mode 100755
index 000000000..208a4f9ef
--- /dev/null
+++ b/scripts/android/build_monero_all.sh
@@ -0,0 +1,8 @@
+# /bin/bash
+
+./build_iconv.sh
+./build_boost.sh
+./build_openssl.sh
+./build_sodium.sh
+./build_zmq.sh
+./build_monero.sh
diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
index 246f6f721..7a1137a2f 100755
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -24,7 +24,7 @@ CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"
 HAVEN_VERSION="1.0.0"
-HAVEN_BUILD_NUMBER=1
+HAVEN_BUILD_NUMBER=3
 HAVEN_BUNDLE_ID="com.cakewallet.haven"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_IOS_TYPE} " ]]; then
diff --git a/scripts/ios/build_deps.sh b/scripts/ios/build_all.sh
similarity index 100%
rename from scripts/ios/build_deps.sh
rename to scripts/ios/build_all.sh