diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index 3018c8aacc..ccead8525c 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -4113,8 +4113,8 @@ Build:57.0.4,570410
     ndk=r12b
 
 Build:58.0.2,580200
-    disable=waiting for fdroidserver update
     commit=FENNEC_58_0_2_RELEASE
+    timeout=21600
     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
     srclibs=MozLocales@f39951ae735980571966856e13110c23377bee50
@@ -4148,8 +4148,8 @@ Build:58.0.2,580200
     ndk=r15c
 
 Build:58.0.2,580210
-    disable=waiting for fdroidserver update
     commit=FENNEC_58_0_2_RELEASE
+    timeout=21600
     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
     srclibs=MozLocales@f39951ae735980571966856e13110c23377bee50