diff --git a/metadata/com.nutomic.syncthingandroid.txt b/metadata/com.nutomic.syncthingandroid.txt
index af16b3c20d..17ec86f574 100644
--- a/metadata/com.nutomic.syncthingandroid.txt
+++ b/metadata/com.nutomic.syncthingandroid.txt
@@ -581,11 +581,7 @@ Build:0.10.0-beta3,4131
 Build:0.10.0,4133
     commit=0.10.0
     submodules=yes
-    sudo=apt-get install -y golang-go/jessie-backports golang-src/jessie-backports && \
-        chown vagrant:vagrant /opt/gradle/versions
-    init=wget -q https://downloads.gradle.org/distributions/gradle-4.3.1-bin.zip && \
-        unzip -qq gradle-4.3.1-bin.zip && \
-        mv gradle-4.3.1 /opt/gradle/versions/4.3.1
+    sudo=apt-get install -y golang-go/jessie-backports golang-src/jessie-backports
     gradle=yes
     output=app/build/outputs/apk/app-release-unsigned.apk
     ndk=r15c
diff --git a/metadata/org.kontalk.txt b/metadata/org.kontalk.txt
index d51dd6cb47..6abac8e23b 100644
--- a/metadata/org.kontalk.txt
+++ b/metadata/org.kontalk.txt
@@ -568,10 +568,6 @@ Build:4.1.0,260
     commit=v4.1.0
     subdir=app
     submodules=yes
-    sudo=. /etc/profile.d/bsenv.sh && \
-        echo -e '\nd56f5187479451eabf01fb78af6dfcb131a6481e' > $ANDROID_HOME/licenses/android-sdk-license && \
-        chgrp vagrant $ANDROID_HOME/platforms && \
-        chmod g+w $ANDROID_HOME/platforms
     init=sed -i -e 's/signingConfig signingConfigs.release/{}/g' build.gradle && \
         rm ../gradle.properties
     gradle=basic
@@ -583,10 +579,6 @@ Build:4.1.1,270
     commit=v4.1.1
     subdir=app
     submodules=yes
-    sudo=. /etc/profile.d/bsenv.sh && \
-        echo -e '\nd56f5187479451eabf01fb78af6dfcb131a6481e' > $ANDROID_HOME/licenses/android-sdk-license && \
-        chgrp vagrant $ANDROID_HOME/platforms && \
-        chmod g+w $ANDROID_HOME/platforms
     init=sed -i -e 's/signingConfig signingConfigs.release/{}/g' build.gradle && \
         rm ../gradle.properties
     gradle=basic