diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87a57fd9..5a57c966 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,15 +5,16 @@ stages:
 
 build apk:
   stage: build
-  image: ubuntu:18.04
+  image: lbry/android-base:latest
   before_script:
     - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign
-    - wget https://nodejs.org/dist/latest-v10.x/node-v10.19.0-linux-x64.tar.gz
+    - wget -q https://nodejs.org/dist/latest-v10.x/node-v10.19.0-linux-x64.tar.gz
     - tar xf node-v10.19.0-linux-x64.tar.gz -C /opt
     - ln -s /opt/node-v10.19.0-linux-x64/bin/node /usr/bin/node
     - ln -s /opt/node-v10.19.0-linux-x64/bin/npm /usr/bin/npm
     - ln -s /opt/node-v10.19.0-linux-x64/bin/npx /usr/bin/npx
     - chmod u+x $CI_PROJECT_DIR/gradlew
+    - export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23
     - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1)  
   artifacts:
     paths:
diff --git a/release.sh b/release.sh
index b7a9aadd..65a67f5c 100755
--- a/release.sh
+++ b/release.sh
@@ -2,7 +2,7 @@
 ./gradlew assembleRelease --console=plain
 version=$(./gradlew -q printVersionName --console=plain | tail -1)
 mkdir -p bin/
-rm bin/*
+rm -f bin/*
 cp app/build/outputs/apk/__32bit/release/app-__32bit-release.apk bin/browser-$version-release-unsigned__arm.apk
 cp app/build/outputs/apk/__64bit/release/app-__64bit-release.apk bin/browser-$version-release-unsigned__arm64.apk