diff --git a/metadata/com.nutomic.syncthingandroid.yml b/metadata/com.nutomic.syncthingandroid.yml
index 1cb1522975..ee219e5b66 100644
--- a/metadata/com.nutomic.syncthingandroid.yml
+++ b/metadata/com.nutomic.syncthingandroid.yml
@@ -1847,17 +1847,11 @@ Builds:
 
   - versionName: 1.21.0
     versionCode: 4319
-    disable: https://github.com/syncthing/syncthing-android/issues/1830
     commit: 3dc29468bc9ef9ca6dfcbc651bf9c3be641cf409
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-      - curl -Lso go.tar.gz https://golang.org/dl/go1.18.6.linux-amd64.tar.gz
-      - echo "bb05f179a773fed60c6a454a24141aaa7e71edfd0f2d465ad610a3b8f1dc7fe8 go.tar.gz"
-        | sha256sum -c -
-      - tar xzf go.tar.gz --strip-components=1 -C /usr/local/
+      - apt-get install -y golang-go
     gradle:
       - yes
     output: app/build/outputs/apk/release/app-release-unsigned.apk