diff --git a/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml b/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml
index 7c70cffdbf..e16317268c 100644
--- a/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml
+++ b/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml
@@ -26,6 +26,8 @@ spec:
               - "/opt/app-root/bin/mm2_crawler"
               - "--threads"
               - "{{ cronjob.threads }}"
+              - "--global-timeout"
+              - "{{ cronjob.timeout }}"
               - "--category"
               - "{{ cronjob.category }}"
               - "crawl"
diff --git a/vars/apps/mirrormanager.yml b/vars/apps/mirrormanager.yml
index e43ca118be..68c98db791 100644
--- a/vars/apps/mirrormanager.yml
+++ b/vars/apps/mirrormanager.yml
@@ -7,19 +7,25 @@ mm2_checkin: false
 mirrormanager_cron_crawler:
   - category: "Fedora Linux"
     schedule: "0 */12 * * *"
-    threads: 20
+    threads: 40
+    timeout: 600
   - category: "Fedora Secondary Arches"
     schedule: "0 3,9 * * *"
     threads: 10
+    timeout: 300
   - category: "Fedora EPEL"
     schedule: "45 */6 * * *"
     threads: 20
+    timeout: 300
   - category: "Fedora Archive"
     schedule: "0 2 * * *"
     threads: 10
+    timeout: 600
   - category: "Fedora Other"
     schedule: "0 14 * * *"
-    threads: 10
+    threads: 20
+    timeout: 600
   - category: "CentOS"
     schedule: "0 5,11 * * *"
     threads: 20
+    timeout: 300