diff --git a/metadata/org.tasks.txt b/metadata/org.tasks.txt
index d1b24f8194..fed9a07972 100644
--- a/metadata/org.tasks.txt
+++ b/metadata/org.tasks.txt
@@ -539,8 +539,10 @@ Build:6.0.5,531
 Build:6.0.6,532
     commit=6.0.6
     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..