diff --git a/metadata/chat.simplex.app.yml b/metadata/chat.simplex.app.yml
index 543b1afbc0..1bf4df402c 100644
--- a/metadata/chat.simplex.app.yml
+++ b/metadata/chat.simplex.app.yml
@@ -416,47 +416,43 @@ Builds:
 
   - versionName: 5.1.3
     versionCode: 127
-    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/13233
     commit: 3267b4d6ca6c9bb06d6ba1abc3ba8ed347ef9e7d
-    timeout: 60000
+    timeout: 30000
     sudo:
       - apt-get update
       - apt-get install -y xz-utils zipalign
       - mkdir -m 0755 /nix
       - chown vagrant /nix
       - chown -R vagrant /tmp
-    output: ./simplex-chat-armv7.apk
+    output: ./simplex-chat-armeabi-v7a.apk
     rm:
       - docs/themes/simplex-chat.sample.zip
     prebuild:
       - mv apps/android/gradle .
       - sed -i -e 's/versionCode .*/versionCode $$VERCODE$$/' apps/android/app/build.gradle
-      - sed -i -e '/android {/a lint {abortOnError false}' apps/android/app/build.gradle
     build:
       - export USER=vagrant
-      - ./scripts/android/build-android.sh -s $$COMMIT$$
+      - ARCHES="armv7a" ./scripts/android/build-android.sh -s $$COMMIT$$
 
   - versionName: 5.1.3
     versionCode: 128
-    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/13233
     commit: 3267b4d6ca6c9bb06d6ba1abc3ba8ed347ef9e7d
-    timeout: 60000
+    timeout: 30000
     sudo:
       - apt-get update
       - apt-get install -y xz-utils zipalign
       - mkdir -m 0755 /nix
       - chown vagrant /nix
       - chown -R vagrant /tmp
-    output: ./simplex-chat-aarch64.apk
+    output: ./simplex-chat-arm64-v8a.apk
     rm:
       - docs/themes/simplex-chat.sample.zip
     prebuild:
       - mv apps/android/gradle .
       - sed -i -e 's/versionCode .*/versionCode $$VERCODE$$/' apps/android/app/build.gradle
-      - sed -i -e '/android {/a lint {abortOnError false}' apps/android/app/build.gradle
     build:
       - export USER=vagrant
-      - ./scripts/android/build-android.sh -s $$COMMIT$$
+      - ARCHES="aarch64" ./scripts/android/build-android.sh -s $$COMMIT$$
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v[\d.]+$