diff --git a/metadata/io.element.android.x.yml b/metadata/io.element.android.x.yml
index 2f840c3eea..d5763ba59b 100644
--- a/metadata/io.element.android.x.yml
+++ b/metadata/io.element.android.x.yml
@@ -225,116 +225,9 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
       $$OUT$$ 'a0086df'
 
-  - versionName: 0.5.2
-    versionCode: 40005021
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.5.2
-    subdir: app
-    gradle:
-      - fdroid
-    output: build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release-unsigned.apk
-    binary: https://github.com/element-hq/element-x-android/releases/download/v%v/app-fdroid-armeabi-v7a-release-signed.apk
-    srclibs:
-      - reproducible-apk-tools@v0.2.7
-    rm:
-      - libraries/pushproviders/firebase
-    prebuild:
-      - sed -i -e '/gms/d' ../build.gradle.kts
-      - sed -i -e '/gplayImplementation/d' build.gradle.kts
-      - echo -e "\nservices.maptiler.apikey=agdgS5zCgFZF5gDi9VXS" >> ../local.properties
-      - echo -e "\nservices.maptiler.darkMapId=dea61faf-292b-4774-9660-58fcef89a7f3"
-        >> ../local.properties
-      - echo -e "\nservices.maptiler.lightMapId=9bc819c8-e627-474a-a348-ec144fe3d810"
-        >> ../local.properties
-      - sed -i -e 's/"git rev-parse --abbrev-ref HEAD"/"echo main"/' ../plugins/src/main/kotlin/extension/Utils.kt
-    scandelete:
-      - plugins
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
-      $$OUT$$ '0000000'
-
-  - versionName: 0.5.2
-    versionCode: 40005022
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.5.2
-    subdir: app
-    gradle:
-      - fdroid
-    output: build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release-unsigned.apk
-    binary: https://github.com/element-hq/element-x-android/releases/download/v%v/app-fdroid-arm64-v8a-release-signed.apk
-    srclibs:
-      - reproducible-apk-tools@v0.2.7
-    rm:
-      - libraries/pushproviders/firebase
-    prebuild:
-      - sed -i -e '/gms/d' ../build.gradle.kts
-      - sed -i -e '/gplayImplementation/d' build.gradle.kts
-      - echo -e "\nservices.maptiler.apikey=agdgS5zCgFZF5gDi9VXS" >> ../local.properties
-      - echo -e "\nservices.maptiler.darkMapId=dea61faf-292b-4774-9660-58fcef89a7f3"
-        >> ../local.properties
-      - echo -e "\nservices.maptiler.lightMapId=9bc819c8-e627-474a-a348-ec144fe3d810"
-        >> ../local.properties
-      - sed -i -e 's/"git rev-parse --abbrev-ref HEAD"/"echo main"/' ../plugins/src/main/kotlin/extension/Utils.kt
-    scandelete:
-      - plugins
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
-      $$OUT$$ '0000000'
-
-  - versionName: 0.5.2
-    versionCode: 40005023
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.5.2
-    subdir: app
-    gradle:
-      - fdroid
-    output: build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned.apk
-    binary: https://github.com/element-hq/element-x-android/releases/download/v%v/app-fdroid-x86-release-signed.apk
-    srclibs:
-      - reproducible-apk-tools@v0.2.7
-    rm:
-      - libraries/pushproviders/firebase
-    prebuild:
-      - sed -i -e '/gms/d' ../build.gradle.kts
-      - sed -i -e '/gplayImplementation/d' build.gradle.kts
-      - echo -e "\nservices.maptiler.apikey=agdgS5zCgFZF5gDi9VXS" >> ../local.properties
-      - echo -e "\nservices.maptiler.darkMapId=dea61faf-292b-4774-9660-58fcef89a7f3"
-        >> ../local.properties
-      - echo -e "\nservices.maptiler.lightMapId=9bc819c8-e627-474a-a348-ec144fe3d810"
-        >> ../local.properties
-      - sed -i -e 's/"git rev-parse --abbrev-ref HEAD"/"echo main"/' ../plugins/src/main/kotlin/extension/Utils.kt
-    scandelete:
-      - plugins
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
-      $$OUT$$ '0000000'
-
-  - versionName: 0.5.2
-    versionCode: 40005024
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.5.2
-    subdir: app
-    gradle:
-      - fdroid
-    output: build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned.apk
-    binary: https://github.com/element-hq/element-x-android/releases/download/v%v/app-fdroid-x86_64-release-signed.apk
-    srclibs:
-      - reproducible-apk-tools@v0.2.7
-    rm:
-      - libraries/pushproviders/firebase
-    prebuild:
-      - sed -i -e '/gms/d' ../build.gradle.kts
-      - sed -i -e '/gplayImplementation/d' build.gradle.kts
-      - echo -e "\nservices.maptiler.apikey=agdgS5zCgFZF5gDi9VXS" >> ../local.properties
-      - echo -e "\nservices.maptiler.darkMapId=dea61faf-292b-4774-9660-58fcef89a7f3"
-        >> ../local.properties
-      - echo -e "\nservices.maptiler.lightMapId=9bc819c8-e627-474a-a348-ec144fe3d810"
-        >> ../local.properties
-      - sed -i -e 's/"git rev-parse --abbrev-ref HEAD"/"echo main"/' ../plugins/src/main/kotlin/extension/Utils.kt
-    scandelete:
-      - plugins
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
-      $$OUT$$ '0000000'
-
   - versionName: 0.5.3
     versionCode: 40005031
+    disable: https://github.com/element-hq/element-x-android/issues/3420
     commit: v0.5.3
     subdir: app
     gradle:
@@ -361,6 +254,7 @@ Builds:
 
   - versionName: 0.5.3
     versionCode: 40005032
+    disable: https://github.com/element-hq/element-x-android/issues/3420
     commit: v0.5.3
     subdir: app
     gradle:
@@ -387,6 +281,7 @@ Builds:
 
   - versionName: 0.5.3
     versionCode: 40005033
+    disable: https://github.com/element-hq/element-x-android/issues/3420
     commit: v0.5.3
     subdir: app
     gradle:
@@ -413,6 +308,7 @@ Builds:
 
   - versionName: 0.5.3
     versionCode: 40005034
+    disable: https://github.com/element-hq/element-x-android/issues/3420
     commit: v0.5.3
     subdir: app
     gradle:
diff --git a/metadata/io.github.antoinepirlot.satunes.yml b/metadata/io.github.antoinepirlot.satunes.yml
index 08b8a3db7e..324562b2b5 100644
--- a/metadata/io.github.antoinepirlot.satunes.yml
+++ b/metadata/io.github.antoinepirlot.satunes.yml
@@ -161,18 +161,6 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
       'META-INF/services/*'
 
-  - versionName: 2.2.3
-    versionCode: 50
-    commit: 0e1ff708d25928ae1c4410ee0eac6e8a1562955d
-    subdir: app
-    submodules: true
-    gradle:
-      - yes
-    srclibs:
-      - reproducible-apk-tools@v0.2.8
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
-      'META-INF/services/*'
-
   - versionName: 2.2.4
     versionCode: 51
     commit: a6ef746566810488c60d252fd9a0f3f097e8cc80