diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index e63d21bde9..9b2ea5d3c4 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -20,6 +20,12 @@ Spree.config do |config|
   # Auto-capture payments. Without this option, payments must be manually captured in the paypal interface.
   config.auto_capture = true
   #config.override_actionmailer_config = false
+
+  # S3 settings
+  config.s3_bucket = ENV['S3_BUCKET'] if ENV['S3_BUCKET']
+  config.s3_access_key = ENV['S3_ACCESS_KEY'] if ENV['S3_ACCESS_KEY']
+  config.s3_secret = ENV['S3_SECRET'] if ENV['S3_SECRET']
+  config.use_s3 = true if ENV['S3_ACCESS_KEY'] && ENV['S3_SECRET']
 end
 
 # Don't log users out when setting a new password