diff --git a/config/application.rb b/config/application.rb
index b041b7a0b..18929c270 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -51,7 +51,7 @@ module Consul
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    config.time_zone = "Madrid"
+    config.time_zone = Rails.application.secrets.time_zone.presence || "Madrid"
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
diff --git a/config/secrets.yml.example b/config/secrets.yml.example
index 8b132be01..d807b0be2 100644
--- a/config/secrets.yml.example
+++ b/config/secrets.yml.example
@@ -16,6 +16,7 @@ http_basic_auth: &http_basic_auth
   http_basic_auth: true
 
 development:
+  # time_zone: ""
   http_basic_username: "dev"
   http_basic_password: "pass"
   devise_lockable: false
@@ -31,12 +32,14 @@ development:
   <<: *maps
 
 test:
+  # time_zone: ""
   secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
   <<: *maps
 
 staging:
   # secret_key_base: ""
   server_name: ""
+  # time_zone: ""
   # mailer_delivery_method: :smtp
   # smtp_settings:
   #   :address: "smtp.example.com"
@@ -81,6 +84,7 @@ staging:
 preproduction:
   # secret_key_base: ""
   server_name: ""
+  # time_zone: ""
   # mailer_delivery_method: :smtp
   # smtp_settings:
   #   :address: "smtp.example.com"
@@ -131,6 +135,7 @@ preproduction:
 production:
   # secret_key_base: ""
   server_name: ""
+  # time_zone: ""
   # mailer_delivery_method: :smtp
   # smtp_settings:
   #   :address: "smtp.example.com"