diff --git a/environment.rb b/environment.rb
index 387685a6..03046ec7 100644
--- a/environment.rb
+++ b/environment.rb
@@ -150,5 +150,5 @@ CSV.foreach("./files/country_codes.csv") do |row|
 end
 
 gandi_opts = {}
-gandi_opts[:env] = :test unless ENV['RACK_ENV'] == 'production'
+gandi_opts[:env] = :test # unless ENV['RACK_ENV'] == 'production'
 $gandi = Gandi::Session.new $config['gandi_api_key'], gandi_opts
diff --git a/models/site.rb b/models/site.rb
index f8ff65fa..db76ddfe 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -1446,7 +1446,7 @@ class Site < Sequel::Model
     purge_cache path
 
     if pathname.extname.match HTML_REGEX
-      ScreenshotWorker.perform_in 1.minute, values[:username], relative_path
+      ScreenshotWorker.perform_in 30.seconds, values[:username], relative_path
     elsif pathname.extname.match IMAGE_REGEX
       ThumbnailWorker.perform_async values[:username], relative_path
     end