diff --git a/metadata/io.homeassistant.android.txt b/metadata/io.homeassistant.android.txt
index 49da31165c..8a22b57fe2 100644
--- a/metadata/io.homeassistant.android.txt
+++ b/metadata/io.homeassistant.android.txt
@@ -24,23 +24,18 @@ Build:0.2,2
     prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> build.gradle
 
 Build:1.0-RC1,3
-    disable=wait for gradle4.0
+    disable=uses com.android.tools.build:gradle:2.4.0-alpha6
     commit=aaedca4a24f92af6823c37bd1d2d0ebb75ed2b7d
     subdir=app
     gradle=fdroid
-    prebuild=sed -i -e '/gmsImplementation/d' build.gradle && \
-        cd .. && \
-        mkdir -p gradle/wrapper && \
-        echo -e 'distributionUrl=https://services.gradle.org/distributions/gradle-4.0-bin.zip' > gradle/wrapper/gradle-wrapper.properties
+    prebuild=sed -i -e '/gmsImplementation/d' build.gradle
 
 Build:1.0,4
+    disable=uses com.android.tools.build:gradle:3.0.0-alpha6
     commit=v1.0
     subdir=app
     gradle=fdroid
-    prebuild=sed -i -e '/gmsImplementation/d' build.gradle && \
-        cd .. && \
-        mkdir -p gradle/wrapper && \
-        echo -e 'distributionUrl=https://services.gradle.org/distributions/gradle-4.0-bin.zip' > gradle/wrapper/gradle-wrapper.properties
+    prebuild=sed -i -e '/gmsImplementation/d' build.gradle
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags