diff --git a/metadata/com.github.catfriend1.syncthingandroid.yml b/metadata/com.github.catfriend1.syncthingandroid.yml
index 150766d7cb..4617a74cd7 100644
--- a/metadata/com.github.catfriend1.syncthingandroid.yml
+++ b/metadata/com.github.catfriend1.syncthingandroid.yml
@@ -1369,23 +1369,22 @@ Builds:
       - PATH="$PWD/go/bin:$PATH" gradle buildNative
     ndk: r19c
 
-  - versionName: 1.9.0.3
-    versionCode: 1090003
-    commit: v1.9.0.3
+  - versionName: 1.9.0.5
+    versionCode: 1090005
+    commit: v1.9.0.5
     submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y -t testing golang-go
     gradle:
       - yes
     output: app/build/outputs/apk/release/app-release-unsigned.apk
     rm:
       - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
     prebuild: sed -i -e '/signingConfig/d' app/build.gradle
-    build:
-      - wget -O go.tgz https://dl.google.com/go/go1.13.linux-amd64.tar.gz
-      - echo '68a2297eb099d1a76097905a2ce334e3155004ec08cdea85f24527be3c48e856  go.tgz'
-        | shasum -c -
-      - tar xf go.tgz
-      - PATH="$PWD/go/bin:$PATH" gradle buildNative
-    ndk: r19c
+    ndk: r20b
+    preassemble:
+      - buildNative
 
 MaintainerNotes: |-
     The submodule in syncthing/src/github.com/syncthing/syncthing must be
@@ -1397,5 +1396,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags ^v[a-z0-9.]*$
-CurrentVersion: 1.9.0.3
-CurrentVersionCode: 1090003
+CurrentVersion: 1.9.0.5
+CurrentVersionCode: 1090005