diff --git a/config/elasticsearch.yml b/config/elasticsearch.yml
new file mode 100644
index 000000000..bad9c21a8
--- /dev/null
+++ b/config/elasticsearch.yml
@@ -0,0 +1,5 @@
+development: &default
+  host: 'http://es01:9200'
+  log: true
+test:
+  host: 'http://es01:9200'
diff --git a/config/initializers/elasticsearch.rb b/config/initializers/elasticsearch.rb
new file mode 100644
index 000000000..f6402cbaf
--- /dev/null
+++ b/config/initializers/elasticsearch.rb
@@ -0,0 +1,15 @@
+# config/initializer/elasticsearch.rb
+
+config = {
+  transport_options: { request: { timeout: 5 } }
+}
+if File.exist?('config/elasticsearch.yml')
+  template = ERB.new(File.new('config/elasticsearch.yml').read)
+  processed = YAML.safe_load(template.result(binding))
+  config.merge!(processed[Rails.env].symbolize_keys)
+end
+
+# if you choose to use elasticsearch-rails-model
+Elasticsearch::Model.client = Elasticsearch::Client.new(config)
+# if you choose to use elasticsearch-rails-persistence
+# Elasticsearch::Persistence.client = Elasticsearch::Client.new(config)