diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 8ee8c9abdf48c95bca37b8c4ae17bd7e602e0827..5196cdcde088eb012c90a8b8b8de94ea4076bdec 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -4,6 +4,7 @@
 
 class ImageUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
+  storage :s3
 
   def store_dir
     "uploads/images"
diff --git a/chef/cookbooks/common/templates/default/nginx.conf.erb b/chef/cookbooks/common/templates/default/nginx.conf.erb
index c06963b53c266031999d48f6e5ce84cb5b673012..a8aa121ec676057f7ec5a922fddb3081772699d7 100644
--- a/chef/cookbooks/common/templates/default/nginx.conf.erb
+++ b/chef/cookbooks/common/templates/default/nginx.conf.erb
@@ -108,13 +108,14 @@ http {
      proxy_pass http://thin_cluster;
      break;
     }
+
+    rewrite ^/uploads/images/(.*)$ https://joindiaspora.s3.amazonaws.com/uploads/images/$1 permanent;
    }
 
    error_page 500 502 503 504 /50x.html;
    location = /50x.html {
     root html;
    }
-
 }
 
 }