diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index 3c74600..0c4185c 100644
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -50,7 +50,5 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/v')
         with:
           files: |
-            ${{ steps.extract.outputs.destination }}/app-arm64-v8a-release.apk
-            ${{ steps.extract.outputs.destination }}/app-armeabi-v7a-release.apk
-            ${{ steps.extract.outputs.destination }}/app-x86_64-release.apk
+            ${{ steps.extract.outputs.destination }}/app-release.aab
 
diff --git a/Makefile.toml b/Makefile.toml
index e1edfd4..f5e1928 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -103,9 +103,6 @@ dependencies = [
     "android-armv7",
     "android-armv7-release",
     "post-android-armv7",
-    "android-i686",
-    "android-i686-release",
-    "post-android-i686",
     "android-x86_64",
     "android-x86_64-release",
     "post-android-x86_64",
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1bd2bb0..9456a9b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -46,6 +46,9 @@ android {
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+        ndk {
+            abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
+        }
     }
 
     signingConfigs {
diff --git a/build.sh b/build.sh
index c995528..62efa53 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,2 @@
 cargo make --profile release
-flutter build apk --split-per-abi
 flutter build appbundle
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9928c1b..d28eed0 100755
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,4 +11,4 @@ RUN --mount=type=secret,id=pwd cd /zwallet && ./configure.sh zcash && ./build.sh
 
 FROM alpine:latest
 WORKDIR /root
-COPY --from=builder /zwallet/build/app/outputs/flutter-apk/* ./
+COPY --from=builder /zwallet/build/app/outputs/bundle/release/* ./
diff --git a/docker/Dockerfile-dev b/docker/Dockerfile-dev
index 65baddc..7b543c0 100755
--- a/docker/Dockerfile-dev
+++ b/docker/Dockerfile-dev
@@ -17,4 +17,4 @@ RUN --mount=type=secret,id=pwd cd /zwallet && ./configure.sh zcash && ./build.sh
 
 FROM alpine:latest
 WORKDIR /root
-COPY --from=builder2 /zwallet/build/app/outputs/flutter-apk/* ./
+COPY --from=builder2 /zwallet/build/app/outputs/bundle/release/* ./
diff --git a/install-deps.sh b/install-deps.sh
index 54b56c1..322faaf 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -23,12 +23,9 @@ curl -o flutter.tar.xz https://storage.googleapis.com/flutter_infra_release/rele
 tar xvf flutter.tar.xz
 rm -f flutter.tar.xz
 
-curl -sSL https://git.io/get-mo -o /usr/bin/mo
-chmod +x /usr/bin/mo
-
-mkdir /root/.zcash-params
-curl https://download.z.cash/downloads/sapling-output.params -o /root/.zcash-params/sapling-output.params
-curl https://download.z.cash/downloads/sapling-spend.params -o /root/.zcash-params/sapling-spend.params
+mkdir $HOME/.zcash-params
+curl https://download.z.cash/downloads/sapling-output.params -o $HOME/.zcash-params/sapling-output.params
+curl https://download.z.cash/downloads/sapling-spend.params -o $HOME/.zcash-params/sapling-spend.params
 
 export ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/21.4.7075529
 export PATH=$PATH:/flutter/bin
diff --git a/lib/reset.dart b/lib/reset.dart
index 0ee2fdf..810ff92 100644
--- a/lib/reset.dart
+++ b/lib/reset.dart
@@ -89,9 +89,12 @@ class FullBackupPage extends StatelessWidget {
             child: Column(children: [
           TextField(
             decoration: InputDecoration(labelText: s.backupEncryptionKey),
+            minLines: 1,
+            maxLines: 5,
             controller: controller,
             readOnly: true,
           ),
+          Padding(padding: EdgeInsets.symmetric(vertical: 8)),
           ElevatedButton.icon(
               onPressed: () => _onSave(context),
               icon: Icon(Icons.save),
@@ -120,8 +123,11 @@ class _FullRestoreState extends State<FullRestorePage> {
         body: Card(child: Column(children: [
           TextField(
             decoration: InputDecoration(labelText: s.backupEncryptionKey),
+            minLines: 1,
+            maxLines: 5,
             controller: controller,
           ),
+          Padding(padding: EdgeInsets.symmetric(vertical: 8)),
           ElevatedButton.icon(
               onPressed: _onLoad,
               icon: Icon(Icons.open_in_new),
diff --git a/pubspec.yaml b/pubspec.yaml
index fac5dba..e593847 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.2.1+213
+version: 1.2.1+214
 
 environment:
   sdk: ">=2.12.0 <3.0.0"