diff --git a/config/application.rb b/config/application.rb
index e851bc345..7cd7052d4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -32,7 +32,7 @@ module Consul
 
     # Add lib to the autoload path
     config.autoload_paths << Rails.root.join('lib')
-    config.time_zone = 'Madrid'
+    config.time_zone = Rails.application.secrets.time_zone
     config.active_job.queue_adapter = :delayed_job
 
     # CONSUL specific custom overrides
diff --git a/config/secrets.yml.example b/config/secrets.yml.example
index 5157e350c..8dab81809 100644
--- a/config/secrets.yml.example
+++ b/config/secrets.yml.example
@@ -1,4 +1,5 @@
 default: &default
+  time_zone: 'Madrid'
   secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
 
 maps: &maps
@@ -40,6 +41,7 @@ staging:
   <<: *apis
 
 preproduction:
+  time_zone: 'Madrid'
   secret_key_base: ""
   server_name: ""
   rollbar_server_token: ""
@@ -57,6 +59,7 @@ preproduction:
   <<: *apis
 
 production:
+  time_zone: 'Madrid'
   secret_key_base: ""
   server_name: ""
   rollbar_server_token: ""