diff --git a/metadata/se.leap.bitmaskclient.txt b/metadata/se.leap.bitmaskclient.txt
index dadf9772a8..a67b1c3544 100644
--- a/metadata/se.leap.bitmaskclient.txt
+++ b/metadata/se.leap.bitmaskclient.txt
@@ -51,12 +51,18 @@ Build:0.9.9,136
     submodules=yes
     gradle=normalProduction
     rm=ics-openvpn/main/src/main/cpp/mbedtls/tests
-    prebuild=sed -i -e 's|./gradlew|gradle|' ../build_deps.sh
+    prebuild=sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
     build=cd .. && \
-        ./cleanProject.sh && \
+        echo '/opt/gradle/versions/4.6/bin/gradle "$@"' > ics-openvpn/gradlew && \
+        chmod a+x ics-openvpn/gradlew && \
         ./build_deps.sh
     ndk=r16b
 
+Maintainer Notes:
+Use absolute path to the proper Gradle version in ics-openvpn/gradlew until
+fdroidserver@8e471ad8 is deployed.
+.
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags ^[0-9.]+$
 Current Version:0.9.9