diff --git a/CHANGELOG-EE b/CHANGELOG-EE
index afd62d25801d445e15686222a116e76e7d8f8453..618cce5dbfaddb4886369d596add82b3e30a1080 100644
--- a/CHANGELOG-EE
+++ b/CHANGELOG-EE
@@ -4,6 +4,7 @@ v 8.13.0 (unreleased)
   - Fix 500 error updating mirror URLs for projects
   - Fix validations related to mirroring settings form. !773
   - Fix Git access panel for Wikis when Kerberos authentication is enabled (Borja Aparicio)
+  - Decrease maximum time that GitLab waits for a mirror to finish !791 (Borja Aparicio)
 
 v 8.12.5
   - No EE-specific changes
diff --git a/app/workers/update_all_mirrors_worker.rb b/app/workers/update_all_mirrors_worker.rb
index c6a2d26a55c2fd3e70fa7bd634bc91a5b4bf4049..b21dd9c3dcbd2ca8d6e5e34f331b53a7aed36d61 100644
--- a/app/workers/update_all_mirrors_worker.rb
+++ b/app/workers/update_all_mirrors_worker.rb
@@ -16,7 +16,7 @@ def perform
   def fail_stuck_mirrors!
     stuck = Project.mirror.
       with_import_status(:started).
-      where('mirror_last_update_at < ?', 1.day.ago)
+      where('mirror_last_update_at < ?', 2.hours.ago)
 
     stuck.find_each(batch_size: 50) do |project|
       project.mark_import_as_failed('The mirror update took too long to complete.')
diff --git a/spec/workers/update_all_mirrors_worker_spec.rb b/spec/workers/update_all_mirrors_worker_spec.rb
index 150e756b163c7752109122a017eb24a34bcb0843..62988f2396474b4ccb05d862d98bd250406060ed 100644
--- a/spec/workers/update_all_mirrors_worker_spec.rb
+++ b/spec/workers/update_all_mirrors_worker_spec.rb
@@ -42,7 +42,7 @@
 
   describe '#fail_stuck_mirrors!' do
     it 'ignores records that are not mirrors' do
-      create(:empty_project, :import_started, mirror_last_update_at: 3.days.ago)
+      create(:empty_project, :import_started, mirror_last_update_at: 12.hours.ago)
 
       expect_any_instance_of(Project).not_to receive(:import_fail)
 
@@ -50,7 +50,7 @@
     end
 
     it 'ignores records without in-progress import' do
-      create(:empty_project, :mirror, :import_finished, mirror_last_update_at: 3.days.ago)
+      create(:empty_project, :mirror, :import_finished, mirror_last_update_at: 12.hours.ago)
 
       expect_any_instance_of(Project).not_to receive(:import_fail)
 
@@ -66,7 +66,7 @@
     end
 
     it 'transitions stuck mirrors to a failed state' do
-      project = create(:empty_project, :mirror, mirror_last_update_at: 3.days.ago)
+      project = create(:empty_project, :mirror, mirror_last_update_at: 12.hours.ago)
 
       perform
       project.reload
@@ -75,7 +75,7 @@
     end
 
     it 'updates the import_error message' do
-      project = create(:empty_project, :mirror, mirror_last_update_at: 3.days.ago)
+      project = create(:empty_project, :mirror, mirror_last_update_at: 12.hours.ago)
 
       perform
       project.reload