diff --git a/metadata/dk.kjeldsen.carwingsflutter.yml b/metadata/dk.kjeldsen.carwingsflutter.yml
index 4f0f174899..b246c69e5a 100644
--- a/metadata/dk.kjeldsen.carwingsflutter.yml
+++ b/metadata/dk.kjeldsen.carwingsflutter.yml
@@ -23,6 +23,7 @@ Repo: https://gitlab.com/tobiaswkjeldsen/carwingsflutter.git
 Builds:
   - versionName: 1.5.2
     versionCode: 86
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.5.2
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -37,6 +38,7 @@ Builds:
 
   - versionName: 1.5.3
     versionCode: 87
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.5.3
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -51,6 +53,7 @@ Builds:
 
   - versionName: 1.5.4
     versionCode: 90
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.5.4
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -65,6 +68,7 @@ Builds:
 
   - versionName: 1.5.5
     versionCode: 91
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.5.5
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -79,6 +83,7 @@ Builds:
 
   - versionName: 1.5.8
     versionCode: 94
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.5.8
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -93,6 +98,7 @@ Builds:
 
   - versionName: 1.5.9
     versionCode: 99
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.5.9
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -107,6 +113,7 @@ Builds:
 
   - versionName: 1.6.0
     versionCode: 100
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.6.0
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -121,6 +128,7 @@ Builds:
 
   - versionName: 1.6.1
     versionCode: 101
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.6.1
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -135,6 +143,7 @@ Builds:
 
   - versionName: 1.6.3
     versionCode: 104
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.6.3
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -149,6 +158,7 @@ Builds:
 
   - versionName: 1.6.4
     versionCode: 105
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.6.4
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -163,6 +173,7 @@ Builds:
 
   - versionName: 1.6.6
     versionCode: 107
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.6.6
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -177,6 +188,7 @@ Builds:
 
   - versionName: 1.6.8
     versionCode: 109
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.6.8
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -191,6 +203,7 @@ Builds:
 
   - versionName: 1.6.9
     versionCode: 112
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.6.9
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -205,6 +218,7 @@ Builds:
 
   - versionName: 1.7.0
     versionCode: 113
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.7.0
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -219,6 +233,7 @@ Builds:
 
   - versionName: 1.7.1
     versionCode: 117
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.7.1
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -233,6 +248,7 @@ Builds:
 
   - versionName: 1.7.3
     versionCode: 120
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.7.3
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -247,6 +263,7 @@ Builds:
 
   - versionName: 1.7.4
     versionCode: 121
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.7.4
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -261,6 +278,7 @@ Builds:
 
   - versionName: 1.7.5
     versionCode: 122
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.7.5
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -275,6 +293,7 @@ Builds:
 
   - versionName: 1.7.7
     versionCode: 124
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.7.7
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -289,6 +308,7 @@ Builds:
 
   - versionName: 1.7.8
     versionCode: 125
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.7.8
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -303,6 +323,7 @@ Builds:
 
   - versionName: 1.7.9
     versionCode: 126
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.7.9
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -317,6 +338,7 @@ Builds:
 
   - versionName: 1.8.0
     versionCode: 129
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.8.0
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -331,6 +353,7 @@ Builds:
 
   - versionName: 1.8.0
     versionCode: 130
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.8.0
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -345,6 +368,7 @@ Builds:
 
   - versionName: 1.8.4
     versionCode: 133
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.8.4
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -359,6 +383,7 @@ Builds:
 
   - versionName: 1.8.5
     versionCode: 134
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.8.5
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -388,6 +413,7 @@ Builds:
 
   - versionName: 1.8.7
     versionCode: 138
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.8.7
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -402,6 +428,7 @@ Builds:
 
   - versionName: 1.8.8
     versionCode: 139
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.8.8
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -416,6 +443,7 @@ Builds:
 
   - versionName: 1.8.9
     versionCode: 141
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.8.9
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -430,6 +458,7 @@ Builds:
 
   - versionName: 1.9.1
     versionCode: 144
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.9.1
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -444,6 +473,7 @@ Builds:
 
   - versionName: 1.9.2
     versionCode: 148
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.9.2
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -458,6 +488,7 @@ Builds:
 
   - versionName: 1.9.3
     versionCode: 149
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.9.3
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -472,6 +503,7 @@ Builds:
 
   - versionName: 1.9.4
     versionCode: 151
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.9.4
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -486,6 +518,7 @@ Builds:
 
   - versionName: 1.9.5
     versionCode: 153
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.9.5
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -500,6 +533,7 @@ Builds:
 
   - versionName: 1.9.6
     versionCode: 155
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.9.6
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -514,6 +548,7 @@ Builds:
 
   - versionName: 1.9.7
     versionCode: 159
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.9.7
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -528,6 +563,7 @@ Builds:
 
   - versionName: 1.9.9
     versionCode: 162
+    disable: Found class 'com.android.billingclient.api.q'
     commit: 1.9.9
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
@@ -540,36 +576,17 @@ Builds:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: 1.9.10
-    versionCode: 163
-    disable: fails to build
-    commit: 1.9.10
-    output: build/app/outputs/apk/release/app-release.apk
-    srclibs:
-      - flutter@1.22.5
-    prebuild:
-      - touch android/key.properties
-      - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output
-        -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-
   - versionName: 1.9.10
     versionCode: 164
     commit: f-droid-1.9.10
-    output: build/app/outputs/apk/release/app-release.apk
+    output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@1.22.5
-    prebuild:
-      - touch android/key.properties
-      - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output
-        -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
 
-AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+AutoUpdateMode: Version f-droid-%v
+UpdateCheckMode: Tags ^f-droid
 CurrentVersion: 1.9.10
 CurrentVersionCode: 164