diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index 2d85e4b0da..cb5776b3cf 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -4113,6 +4113,7 @@ Build:57.0.4,570410
     ndk=r12b
 
 Build:58.0.1,580100
+    disable=waiting for fdroidserver update
     commit=FENNEC_58_0_1_RELEASE
     sudo=apt-get install -y g++ proguard-cli/testing libproguard-java/testing
     output=obj-arm-linux-androideabi/dist/fennec-$$VERSION$$.en-US.android-arm-unsigned-unaligned.apk
@@ -4147,6 +4148,7 @@ Build:58.0.1,580100
     ndk=r15c
 
 Build:58.0.1,580110
+    disable=waiting for fdroidserver update
     commit=FENNEC_58_0_1_RELEASE
     sudo=apt-get install -y g++ proguard-cli/testing libproguard-java/testing
     output=obj-i386-linux-androideabi/dist/fennec-$$VERSION$$.en-US.android-i386-unsigned-unaligned.apk