diff --git a/build/dependencies/build.gradle b/build/dependencies/build.gradle
index 30e3a011833d..053c3ede50a4 100644
--- a/build/dependencies/build.gradle
+++ b/build/dependencies/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     maven { url "https://cache-redirector.jetbrains.com/plugins.gradle.org" }
   }
   dependencies {
-    classpath "de.undercouch:gradle-download-task:3.4.2"
+    classpath "de.undercouch:gradle-download-task:4.1.1"
     classpath "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.9"
   }
 }
diff --git a/build/dependencies/setupCidr.gradle b/build/dependencies/setupCidr.gradle
index 4aca2c611e73..52c55472dbfb 100644
--- a/build/dependencies/setupCidr.gradle
+++ b/build/dependencies/setupCidr.gradle
@@ -1,4 +1,5 @@
 import org.gradle.internal.os.OperatingSystem
+import java.util.concurrent.TimeUnit
 
 final def IJ_DIR = project.file("../../..").canonicalFile
 final def REPOSITORY = "https://repo.labs.intellij.net/clion"
@@ -87,6 +88,9 @@ task setupCidr
             src downloadUrl
             dest packageArchive
             tempAndMove true
+            connectTimeout TimeUnit.SECONDS.toMillis(30).toInteger()
+            readTimeout TimeUnit.MINUTES.toMillis(5).toInteger()
+            retries 10
           }
         }
       }
diff --git a/build/dependencies/setupJbre.gradle b/build/dependencies/setupJbre.gradle
index 4fc8cd9cfaa6..bda2c9a1b59d 100644
--- a/build/dependencies/setupJbre.gradle
+++ b/build/dependencies/setupJbre.gradle
@@ -69,7 +69,9 @@ def downloadJbrTask(String artifactName, String build) {
         src "${jreUrl()}/${artifactName}.tar.gz"
         dest outputFile
         tempAndMove true
-        timeout TimeUnit.MINUTES.toMillis(30).toInteger()
+        connectTimeout TimeUnit.SECONDS.toMillis(30).toInteger()
+        readTimeout TimeUnit.MINUTES.toMillis(5).toInteger()
+        retries 10
       }
     }
     setupJbre.dependsOn(it)
diff --git a/build/dependencies/setupJdk.gradle b/build/dependencies/setupJdk.gradle
index 25d01dcb98d1..95a44c0de9f6 100644
--- a/build/dependencies/setupJdk.gradle
+++ b/build/dependencies/setupJdk.gradle
@@ -70,7 +70,9 @@ static def splitJbrBuild(String jreBuild, String version) {
         src jbrUrl
         dest outputFile
         tempAndMove true
-        timeout TimeUnit.MINUTES.toMillis(30).toInteger()
+        connectTimeout TimeUnit.SECONDS.toMillis(30).toInteger()
+        readTimeout TimeUnit.MINUTES.toMillis(5).toInteger()
+        retries 10
       }
     }
   }
diff --git a/build/dependencies/setupRpluginDeps.gradle b/build/dependencies/setupRpluginDeps.gradle
index 34188fa23833..c063fe313bbd 100644
--- a/build/dependencies/setupRpluginDeps.gradle
+++ b/build/dependencies/setupRpluginDeps.gradle
@@ -22,7 +22,9 @@ task setupRkernel {
         src "https://cache-redirector.jetbrains.com/jetbrains.bintray.com/rplugin/$rkernelVersion-$artifact.name"
         tempAndMove true
         dest artifact
-        timeout TimeUnit.MINUTES.toMillis(30).toInteger()
+        connectTimeout TimeUnit.SECONDS.toMillis(30).toInteger()
+        readTimeout TimeUnit.MINUTES.toMillis(5).toInteger()
+        retries 10
       }
     }
   }
diff --git a/build/dependencies/setupSpacePlugin.gradle b/build/dependencies/setupSpacePlugin.gradle
index 9de6a995d1da..6d23eb88cc05 100644
--- a/build/dependencies/setupSpacePlugin.gradle
+++ b/build/dependencies/setupSpacePlugin.gradle
@@ -10,7 +10,9 @@ task setupSpaceAutomationDefinitions {
       src "https://cache-redirector.jetbrains.com/jetbrains.bintray.com/space/com/jetbrains/space-idea-script-definition/$version/space-idea-script-definition-${version}.jar"
       tempAndMove true
       dest artifact
-      timeout TimeUnit.MINUTES.toMillis(5).toInteger()
+      connectTimeout TimeUnit.SECONDS.toMillis(30).toInteger()
+      readTimeout TimeUnit.MINUTES.toMillis(5).toInteger()
+      retries 10
     }
   }
 }
diff --git a/build/dependencies/setupToolboxLiteGen.gradle b/build/dependencies/setupToolboxLiteGen.gradle
index 644454ddcec1..cc91e0295fe0 100644
--- a/build/dependencies/setupToolboxLiteGen.gradle
+++ b/build/dependencies/setupToolboxLiteGen.gradle
@@ -5,7 +5,7 @@ buildscript {
     maven { url "https://cache-redirector.jetbrains.com/plugins.gradle.org" }
   }
   dependencies {
-    classpath "de.undercouch:gradle-download-task:3.2.0"
+    classpath "de.undercouch:gradle-download-task:4.1.1"
   }
 }
 apply plugin: "de.undercouch.download"