diff --git a/metadata/io.homeassistant.android.txt b/metadata/io.homeassistant.android.txt
index eec8e27789..e2e37b7ba4 100644
--- a/metadata/io.homeassistant.android.txt
+++ b/metadata/io.homeassistant.android.txt
@@ -24,13 +24,14 @@ Build:0.2,2
     prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> build.gradle
 
 Build:1.0-RC1,3
-    disable=play-services, see https://github.com/Maxr1998/home-assistant-Android/issues/29
-    commit=v1.0-rc1
+    disable=wait for gradle4.0
+    commit=aaedca4a24f92af6823c37bd1d2d0ebb75ed2b7d
     subdir=app
-    gradle=yes
-    prebuild=cd .. && \
+    gradle=fdroid
+    prebuild=sed -i -e '/gmsImplementation/d' build.gradle && \
+        cd .. && \
         mkdir -p gradle/wrapper && \
-        echo -e 'distributionUrl=https://services.gradle.org/distributions/gradle-3.5-bin.zip' > gradle/wrapper/gradle-wrapper.properties
+        echo -e 'distributionUrl=https://services.gradle.org/distributions/gradle-4.0-bin.zip' > gradle/wrapper/gradle-wrapper.properties
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags