diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb
index 67ae27e7e4..40ac58adab 100644
--- a/config/initializers/geocoder.rb
+++ b/config/initializers/geocoder.rb
@@ -1,7 +1,9 @@
 # Google requires an API key with a billing account to use their API.
 # The key is stored in config/application.yml.
+
 Geocoder.configure(
-  lookup: :google,
+  timeout: ENV.fetch('GEOCODER_TIMEOUT', 3).to_i,
+  lookup: ENV.fetch('GEOCODER_SERVICE', :google).to_sym,
   use_https: true,
-  api_key: ENV.fetch('GOOGLE_MAPS_API_KEY', nil)
+  api_key: ENV.fetch('GEOCODER_API_KEY', ENV["GOOGLE_MAPS_API_KEY"])
 )