diff --git a/config/s3.yml b/config/s3.yml
index 05a56d6..852bb19 100644
--- a/config/s3.yml
+++ b/config/s3.yml
@@ -13,13 +13,11 @@
 development: &default
   access_key_id: <%= ENV['S3_KEY'] %>
   secret_access_key: <%= ENV['S3_SECRET'] %>
-  bucket: CHANGME_development
+  bucket: <%= ENV['S3_BUCKET'] %>
 
 test:
   <<: *default
-  bucket: CHANGME_test
 
 production:
   <<: *default
-  bucket: CHANGME_production
 
diff --git a/lib/tasks/heroku.rake b/lib/tasks/heroku.rake
index 63acca6..9faf1a5 100644
--- a/lib/tasks/heroku.rake
+++ b/lib/tasks/heroku.rake
@@ -16,6 +16,7 @@ namespace :heroku do
     if ask_yn("Use Amazon S3 for Paperclip uploads?")
       vars[:S3_KEY]    = ask_value('S3 key')
       vars[:S3_SECRET] = ask_value('S3 secret key')
+      vars[:S3_BUCKET] = ask_value('S3 bucket')
     end
 
     if ask_yn("Use Google Analytics to track web traffic?")
--
libgit2 0.21.2