diff --git a/metadata/org.tasks.yml b/metadata/org.tasks.yml
index eda981ea18..6d0105c144 100644
--- a/metadata/org.tasks.yml
+++ b/metadata/org.tasks.yml
@@ -788,6 +788,7 @@ Builds:
 
   - versionName: 6.0.5
     versionCode: 531
+    disable: Google API client
     commit: 6.0.5
     subdir: app
     submodules: true
@@ -1126,6 +1127,7 @@ Builds:
 
   - versionName: 7.3.1
     versionCode: 632
+    disable: Google API client
     commit: 7.3.1
     subdir: app
     submodules: true
@@ -1144,6 +1146,7 @@ Builds:
 
   - versionName: 7.3.2
     versionCode: 633
+    disable: Google API client
     commit: 7.3.2
     subdir: app
     submodules: true
@@ -1162,6 +1165,7 @@ Builds:
 
   - versionName: 7.4.2
     versionCode: 645
+    disable: Google API client
     commit: 7.4.2
     subdir: app
     submodules: true
@@ -1966,8 +1970,9 @@ Builds:
     gradleprops:
       - tasks_mapbox_key="pk.eyJ1IjoiYmFrZXJiYSIsImEiOiJjanUxZG51dDUwMGttNDlvN3p3cHZzaXB3In0.1UWYV5dhTKiw_MkHNkA1jA"
 
-MaintainerNotes: Upstream releases multiple version with changed vercode. Looks like
-    repushing tags.
+MaintainerNotes: |-
+    * Upstream releases multiple version with changed vercode. Looks like repushing tags.
+    * 2021-03-11: disabled builds 531,632,633,645, see https://gitlab.com/fdroid/fdroiddata/-/issues/2294
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags