diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index f4ca3aa..619902b 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -22,7 +22,7 @@ class FileUploader < CarrierWave::Uploader::Base
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
     #{}"uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-    "uploads/files/#{model.album.path}"
+    ENV['STORAGE_PATH'] + "files/#{model.album.path}"
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded
@@ -41,25 +41,25 @@ class FileUploader < CarrierWave::Uploader::Base
        version :collection do
          process :resize_to_fill => [200, 200]
          def store_dir
-           "uploads/thumbs/#{model.album.path}"
+           ENV['STORAGE_PATH'] + "/thumbs/#{model.album.path}"
          end
        end
        version :album do
          process :resize_to_fill => [100, 100]
          def store_dir
-           "uploads/thumbs/#{model.album.path}"
+           ENV['STORAGE_PATH'] + "/thumbs/#{model.album.path}"
          end
        end
        version :preview do
          process :resize_to_fit => [210, 210]
          def store_dir
-           "uploads/thumbs/#{model.album.path}"
+           ENV['STORAGE_PATH'] + "/thumbs/#{model.album.path}"
          end
        end
        version :single do
          process :resize_to_limit => [950, 950]
          def store_dir
-           "uploads/thumbs/#{model.album.path}"
+           ENV['STORAGE_PATH'] + "/thumbs/#{model.album.path}"
          end
        end
 
diff --git a/config/balder.rb b/config/balder.rb
index ed9f254..2175352 100644
--- a/config/balder.rb
+++ b/config/balder.rb
@@ -1,3 +1,4 @@
+ENV['STORAGE_PATH']       = "uploads" if ENV['STORAGE_PATH'].nil?
 #ENV['PRIVATE']           = 'true'
 #ENV['TITLE']            = 'photo'
 #ENV['HEROKU']           = 'true'
diff --git a/config/initializers/s3.rb b/config/initializers/s3.rb
index c0bcd6f..8a389de 100644
--- a/config/initializers/s3.rb
+++ b/config/initializers/s3.rb
@@ -1,5 +1,5 @@
 CarrierWave.configure do |config|
-      config.s3_access_key_id = ENV['S3_KEY']
-      config.s3_secret_access_key = ENV['S3_SECRET']
-      config.s3_bucket = ENV['S3_BUCKET']
-    end
\ No newline at end of file
+  config.s3_access_key_id = ENV['S3_KEY']
+  config.s3_secret_access_key = ENV['S3_SECRET']
+  config.s3_bucket = ENV['S3_BUCKET']
+end
\ No newline at end of file