diff --git a/GITLAB_ELASTICSEARCH_INDEXER_VERSION b/GITLAB_ELASTICSEARCH_INDEXER_VERSION
index 46b81d815a23b1a6b60bc9160f21295a5f9e4e75..d8b698973a4918eb7d323228992b517d7c249f4a 100644
--- a/GITLAB_ELASTICSEARCH_INDEXER_VERSION
+++ b/GITLAB_ELASTICSEARCH_INDEXER_VERSION
@@ -1 +1 @@
-2.11.0
+2.12.0
diff --git a/ee/app/workers/elastic_commit_indexer_worker.rb b/ee/app/workers/elastic_commit_indexer_worker.rb
index 9c0d8b91031e20f2ad6569f06ba8f76d7b479d70..5a32880f6ddcd22ecca02159e7cd54aee0b6d10b 100644
--- a/ee/app/workers/elastic_commit_indexer_worker.rb
+++ b/ee/app/workers/elastic_commit_indexer_worker.rb
@@ -23,7 +23,7 @@ def perform(project_id, wiki = false)
     project = Project.find(project_id)
     return true unless project.use_elasticsearch?
 
-    in_lock("#{self.class.name}/#{project_id}/#{wiki}", ttl: 1.day, retries: 0) do
+    in_lock("#{self.class.name}/#{project_id}/#{wiki}", ttl: (Gitlab::Elastic::Indexer::TIMEOUT + 1.minute), retries: 0) do
       Gitlab::Elastic::Indexer.new(project, wiki: wiki).run
     end
   end
diff --git a/ee/lib/gitlab/elastic/indexer.rb b/ee/lib/gitlab/elastic/indexer.rb
index c04a909a40e26736f20e7740a522c2d62d294647..0bf38d160cbc64b339270f30fdc1b55fd3621015 100644
--- a/ee/lib/gitlab/elastic/indexer.rb
+++ b/ee/lib/gitlab/elastic/indexer.rb
@@ -8,6 +8,8 @@ module Elastic
     class Indexer
       include Gitlab::Utils::StrongMemoize
 
+      TIMEOUT = 1.day.to_i
+
       Error = Class.new(StandardError)
 
       class << self
@@ -73,11 +75,13 @@ def run_indexer!(to_sha, target)
         vars = build_envvars(base_sha, to_sha, target)
         path_to_indexer = Gitlab.config.elasticsearch.indexer_path
 
+        timeout_argument = "--timeout=#{TIMEOUT}s"
+
         command =
           if index_wiki?
-            [path_to_indexer, "--blob-type=wiki_blob", "--skip-commits", "--project-path=#{project.full_path}", project.id.to_s, repository_path]
+            [path_to_indexer, timeout_argument, "--blob-type=wiki_blob", "--skip-commits", "--project-path=#{project.full_path}", project.id.to_s, repository_path]
           else
-            [path_to_indexer, "--project-path=#{project.full_path}", project.id.to_s, repository_path]
+            [path_to_indexer, timeout_argument, "--project-path=#{project.full_path}", project.id.to_s, repository_path]
           end
 
         output, status = Gitlab::Popen.popen(command, nil, vars)
diff --git a/ee/spec/lib/gitlab/elastic/indexer_spec.rb b/ee/spec/lib/gitlab/elastic/indexer_spec.rb
index fdbb37483097fbeb52dec2bdee884e8e810114e2..3cf84c5b455ce3bba8a53d92f7a86956dd255970 100644
--- a/ee/spec/lib/gitlab/elastic/indexer_spec.rb
+++ b/ee/spec/lib/gitlab/elastic/indexer_spec.rb
@@ -92,6 +92,7 @@
         expect_popen.with(
           [
             TestEnv.indexer_bin_path,
+            "--timeout=#{Gitlab::Elastic::Indexer::TIMEOUT}s",
             "--project-path=#{project.full_path}",
             project.id.to_s,
             "#{project.repository.disk_path}.git"
@@ -213,6 +214,7 @@ def indexed_commits_for(term)
         expect_popen.with(
           [
             TestEnv.indexer_bin_path,
+            "--timeout=#{Gitlab::Elastic::Indexer::TIMEOUT}s",
             '--blob-type=wiki_blob',
             '--skip-commits',
             "--project-path=#{project.full_path}",
diff --git a/ee/spec/workers/elastic_commit_indexer_worker_spec.rb b/ee/spec/workers/elastic_commit_indexer_worker_spec.rb
index ea51aa5e7fd815405dd854fc195272e44c71f156..77a67ad0492914d68349e81596da2a5ea1669c63 100644
--- a/ee/spec/workers/elastic_commit_indexer_worker_spec.rb
+++ b/ee/spec/workers/elastic_commit_indexer_worker_spec.rb
@@ -37,7 +37,7 @@
 
     it 'does not run index when it is locked' do
       expect(subject).to receive(:in_lock) # Mock and don't yield
-        .with("ElasticCommitIndexerWorker/#{project.id}/false", ttl: 1.day, retries: 0)
+        .with("ElasticCommitIndexerWorker/#{project.id}/false", ttl: (Gitlab::Elastic::Indexer::TIMEOUT + 1.minute), retries: 0)
 
       expect(Gitlab::Elastic::Indexer).not_to receive(:new)