diff --git a/build.xml b/build.xml
index bce7ff961f11879652f34efe90ea83e6453538e0..7598cca3891bd6be2ce36dcc345baf11c082067d 100644
--- a/build.xml
+++ b/build.xml
@@ -202,8 +202,9 @@
     <if>
       <not><equals arg1="${existing_solr_version}" arg2="${solr_version}" /></not>
       <then>
-        <!-- make sure we don't run out of memory during installation: -->
+        <!-- make sure we don't run out of memory or time during installation: -->
         <php expression="ini_set('memory_limit', '1G');" />
+        <php expression="ini_set('default_socket_timeout', '600');" />
 
         <!-- download from Apache if not already present in the downloads cache -->
         <if>
diff --git a/composer.json b/composer.json
index e33349546c6f7a396ae23c74cb87a567290f9dfd..e3013de3f79dd6b4b5895fcf74068a6b69cc3e77 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,8 @@
     "config": {
         "platform": {
             "php": "7.2"
-        }
+        },
+        "process-timeout": 0
     },
     "require": {
         "php": ">=7.2",