diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
index 364cc1ac..d1c6f8d2 100755
--- a/build/tools/roomservice.py
+++ b/build/tools/roomservice.py
@@ -68,7 +68,7 @@ def add_auth(githubreq):
 if not depsonly:
     githubreq = urllib.request.Request("https://gitownia.eu/tequilaOS/platform_manifest_mirror/raw/branch/staging/volcan/default.xml")
     try:
-        result = ElementTree.fromstring(urllib.request.urlopen(githubreq).read().decode())
+        result = ElementTree.fromstring(urllib.request.urlopen(githubreq, timeout=10).read().decode())
     except urllib.error.URLError:
         print("Failed to fetch data from GitHub")
         sys.exit(1)
@@ -269,7 +269,7 @@ def get_default_or_fallback_revision(repo_name):
 
     githubreq = urllib.request.Request("https://gitownia.eu/api/v1/repos/tequilaOS/" + repo_name + "/branches")
     add_auth(githubreq)
-    result = json.loads(urllib.request.urlopen(githubreq).read().decode())
+    result = json.loads(urllib.request.urlopen(githubreq, timeout=5).read().decode())
     if has_branch(result, default_revision):
         return default_revision