diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py
index df312568226..febb0809023 100644
--- a/readthedocs/settings/base.py
+++ b/readthedocs/settings/base.py
@@ -640,7 +640,10 @@ def BUILD_MEMORY_LIMIT(self):
     # https://github.com/readthedocs/readthedocs.org/issues/12317#issuecomment-3070950434
     # https://docs.celeryq.dev/en/stable/getting-started/backends-and-brokers/redis.html#visibility-timeout
     BROKER_TRANSPORT_OPTIONS = {
-        'visibility_timeout': BUILD_TIME_LIMIT * 1.15,  # 15% more than the build time limit
+        'visibility_timeout': 5 * 60 * 60,  # Use 5hs to cover the longest build just in case
+        'socket_timeout': 5 * 60 * 60,
+        'retry_on_timeout': True,
+        'health_check_interval': 30,
     }
 
     CELERY_DEFAULT_QUEUE = "celery"