diff --git a/roles/openshift-apps/mirrormanager/templates/fedora-messaging.toml b/roles/openshift-apps/mirrormanager/templates/fedora-messaging.toml
index 47a2ac35ce..193dcbb7ce 100644
--- a/roles/openshift-apps/mirrormanager/templates/fedora-messaging.toml
+++ b/roles/openshift-apps/mirrormanager/templates/fedora-messaging.toml
@@ -1,4 +1,4 @@
-amqp_url = "amqps://mirrormanager:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
+amqp_url = "amqps://mirrormanager{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
 
 # Just check if the queue exist, don't try to create it (the server does not allow it).
 passive_declares = true
diff --git a/vars/apps/mirrormanager.yml b/vars/apps/mirrormanager.yml
index e4c7b5a916..2da0a0d78b 100644
--- a/vars/apps/mirrormanager.yml
+++ b/vars/apps/mirrormanager.yml
@@ -58,7 +58,7 @@ mirrormanager_cron_crawler:
   - category: "Fedora Other"
     schedule: "0 14 * * *"
     threads: 20
-    timeout: 600
+    timeout: 1380  # 23h
     include_disabled: false
   # CentOS: regular weekdays run on active mirrors.
   - category: "CentOS"