diff --git a/metadata/io.element.android.x.yml b/metadata/io.element.android.x.yml
index 94403577d3..f5c5744fb9 100644
--- a/metadata/io.element.android.x.yml
+++ b/metadata/io.element.android.x.yml
@@ -1867,40 +1867,6 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
       $$OUT$$ '0000000'
 
-  - versionName: 25.03.3
-    versionCode: 202503033
-    disable: superseded
-    commit: v25.03.3
-    subdir: app
-    sudo:
-      - echo "deb http://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
-      - apt-get update
-      - apt-get install -y openjdk-21-jdk-headless
-      - update-java-alternatives -a
-    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.8
-    rm:
-      - libraries/pushproviders/firebase
-    prebuild:
-      - sed -i -e '/gms/d' ../build.gradle.kts
-      - sed -i -e '/gplayImplementation/d' -e '/firebaseAppDistribution {/,/^            }/d'
-        -e '/firebaseAppDistribution/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
-      - sed -i -e '/firebase/d' ../plugins/build.gradle.kts
-    scandelete:
-      - plugins
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
-      $$OUT$$ '0000000'
-
   - versionName: 25.03.3
     versionCode: 202503034
     commit: v25.03.3
@@ -2629,7 +2595,6 @@ Builds:
 
   - versionName: 25.05.3
     versionCode: 202505031
-    disable: reproducible build failed
     commit: v25.05.3
     subdir: app
     sudo:
@@ -2637,6 +2602,10 @@ Builds:
       - apt-get update
       - apt-get install -y openjdk-21-jdk-headless
       - update-java-alternatives -a
+      - export CPUS_MAX=16
+      - export CPUS=$(getconf _NPROCESSORS_ONLN)
+      - for (( c=$CPUS_MAX; c<$CPUS; c++ )) ; do echo 0 > /sys/devices/system/cpu/cpu$c/online
+        ; done
     gradle:
       - fdroid
     output: build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release-unsigned.apk
@@ -2663,7 +2632,6 @@ Builds:
 
   - versionName: 25.05.3
     versionCode: 202505032
-    disable: reproducible build failed
     commit: v25.05.3
     subdir: app
     sudo:
@@ -2671,6 +2639,10 @@ Builds:
       - apt-get update
       - apt-get install -y openjdk-21-jdk-headless
       - update-java-alternatives -a
+      - export CPUS_MAX=16
+      - export CPUS=$(getconf _NPROCESSORS_ONLN)
+      - for (( c=$CPUS_MAX; c<$CPUS; c++ )) ; do echo 0 > /sys/devices/system/cpu/cpu$c/online
+        ; done
     gradle:
       - fdroid
     output: build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release-unsigned.apk
@@ -2697,7 +2669,6 @@ Builds:
 
   - versionName: 25.05.3
     versionCode: 202505033
-    disable: reproducible build failed
     commit: v25.05.3
     subdir: app
     sudo:
@@ -2705,6 +2676,10 @@ Builds:
       - apt-get update
       - apt-get install -y openjdk-21-jdk-headless
       - update-java-alternatives -a
+      - export CPUS_MAX=16
+      - export CPUS=$(getconf _NPROCESSORS_ONLN)
+      - for (( c=$CPUS_MAX; c<$CPUS; c++ )) ; do echo 0 > /sys/devices/system/cpu/cpu$c/online
+        ; done
     gradle:
       - fdroid
     output: build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned.apk
@@ -2731,7 +2706,6 @@ Builds:
 
   - versionName: 25.05.3
     versionCode: 202505034
-    disable: reproducible build failed
     commit: v25.05.3
     subdir: app
     sudo:
@@ -2739,6 +2713,10 @@ Builds:
       - apt-get update
       - apt-get install -y openjdk-21-jdk-headless
       - update-java-alternatives -a
+      - export CPUS_MAX=16
+      - export CPUS=$(getconf _NPROCESSORS_ONLN)
+      - for (( c=$CPUS_MAX; c<$CPUS; c++ )) ; do echo 0 > /sys/devices/system/cpu/cpu$c/online
+        ; done
     gradle:
       - fdroid
     output: build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned.apk