diff --git a/scripts/build-android b/scripts/build-android
deleted file mode 100755
index ad894fe905..0000000000
--- a/scripts/build-android
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env sh
-
-set -eof pipefail
-
-BRANCH=$1
-if [[ $# -eq 0 ]] ; then
-    echo 'Branch required as first argument'
-    exit 0
-fi
-
-
diff --git a/scripts/build-android.sh b/scripts/build-android.sh
new file mode 100755
index 0000000000..d77e9a465a
--- /dev/null
+++ b/scripts/build-android.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+set -euf
+
+TARGET=${1:-debug}
+
+CURRENT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+. "$CURRENT_DIR/lib/setup/path-support.sh"
+source_lib "output.sh"
+source_lib "properties.sh"
+
+cecho "Building @b@green[[${TARGET}]] environment"
+echo
+
+GRADLE_PROPERTIES="--daemon --parallel -q -b android/build.gradle"
+
+case $TARGET in
+  debug)
+    echo "Not supported yet."
+    ## lein do clean, cljsbuild once android && ./android/gradlew ${GRADLE_PROPERTIES} assembleDebug
+    ## echo "Generated android/app/build/outputs/apk/app-debug.apk"
+    ## TODO Blocked by https://github.com/status-im/status-react/issues/2669
+    exit 1
+    ;;
+  prod)
+    STORE_FILE=$(property_gradle 'STATUS_RELEASE_STORE_FILE')
+    [[ ! -e "${STORE_FILE/#\~/$HOME}" ]] && echo "Please generate keystore first using ./generate-kesytore.sh" && exit 0
+    lein do clean, with-profile prod cljsbuild once android && ./android/gradlew ${GRADLE_PROPERTIES} assembleRelease
+    cecho "Generated @b@blueandroid/app/build/outputs/apk/app-release.apk"
+    echo
+    exit
+    ;;
+  *)
+    echo "Only debug and prod targets are supported"
+    exit 1
+esac
diff --git a/scripts/bundle-status-go.sh b/scripts/bundle-status-go.sh
index 030981c9cc..bc6dc51abb 100755
--- a/scripts/bundle-status-go.sh
+++ b/scripts/bundle-status-go.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-set -eou pipefail
+set -euf pipefail
 
 # TODO Clean up with require STATUS_GO_HOME and STATUS_REACT_HOME
 
diff --git a/scripts/generate-keystore.sh b/scripts/generate-keystore.sh
new file mode 100755
index 0000000000..7ef3c2e62c
--- /dev/null
+++ b/scripts/generate-keystore.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -euf pipefail
+
+TARGET=${1:-debug}
+
+CURRENT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+. "$CURRENT_DIR/lib/setup/path-support.sh"
+source_lib "properties.sh"
+
+STORE_FILE=$(property_gradle 'STATUS_RELEASE_STORE_FILE')
+STORE_FILE="${STORE_FILE/#\~/$HOME}"
+STATUS_RELEASE_STORE_PASSWORD=$(property_gradle 'STATUS_RELEASE_STORE_PASSWORD')
+STATUS_RELEASE_KEY_ALIAS=$(property_gradle 'STATUS_RELEASE_KEY_ALIAS')
+STATUS_RELEASE_KEY_PASSWORD=$(property_gradle 'STATUS_RELEASE_KEY_PASSWORD')
+
+[[ -e "${STORE_FILE/#\~/$HOME}" ]] && echo "Keystore $STORE_FILE already exists, please manually remove it if you want to regenerate." && exit 0
+
+echo "Generating keystore $STORE_FILE"
+keytool -genkey -v -keystore ${STORE_FILE}  -keyalg RSA -keysize 2048 -validity 10000 -alias ${STATUS_RELEASE_KEY_ALIAS} \
+        -storepass ${STATUS_RELEASE_STORE_PASSWORD} -keypass ${STATUS_RELEASE_KEY_PASSWORD} -dname "CN=, OU=, O=, L=, S=, C="
\ No newline at end of file
diff --git a/scripts/lib/setup/properties.sh b/scripts/lib/setup/properties.sh
new file mode 100755
index 0000000000..c9970ee50e
--- /dev/null
+++ b/scripts/lib/setup/properties.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+function property() {
+    grep "${2}" ${1}|cut -d'=' -f2
+}
+
+function property_gradle() {
+    property $(repo_path)/android/gradle.properties ${1}
+}
\ No newline at end of file
diff --git a/scripts/merge-pr.sh b/scripts/merge-pr.sh
index ff309023a7..0b4cbaf387 100755
--- a/scripts/merge-pr.sh
+++ b/scripts/merge-pr.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-set -eof pipefail
+set -euf pipefail
 
 BRANCH=$1
 if [[ $# -eq 0 ]] ; then