diff --git a/metadata/org.tasks.txt b/metadata/org.tasks.txt
index e908a37d46..372d6ae884 100644
--- a/metadata/org.tasks.txt
+++ b/metadata/org.tasks.txt
@@ -531,8 +531,10 @@ Build:5.3.6,508
 Build:6.0.5,531
     commit=6.0.5
     subdir=app
+    submodules=yes
     gradle=generic
-    prebuild=sed -i -e '/googleplayCompile/d' -e '/amazonCompile/d' build.gradle
+    prebuild=sed -i -e '/maven {/,/}/d' -e '/com.google.gms/d' -e '/io.fabric.tools/d' ../build.gradle && \
+        sed -i -e '/io.fabric/d' -e '/googleplayImplementation/d' -e '/amazonImplementation/d' -e '/com.google.gms/d' build.gradle
 
 Maintainer Notes:
 Upstream releases multiple version with changed vercode. Looks like repushing tags..