diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index fefdcc953..73130e75c 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -6,13 +6,23 @@ CarrierWave.configure do |config|
     config.storage = :file
   else
     config.fog_provider = "fog/aws"
-    config.fog_credentials = {
-      provider: "AWS",
-      aws_access_key_id: ApplicationConfig["AWS_ID"],
-      aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
-      region: ApplicationConfig["AWS_DEFAULT_REGION"]
-    }
-    config.fog_directory = ApplicationConfig["AWS_BUCKET_NAME"]
+    if ENV["USE_NEW_AWS"]
+      config.fog_credentials = {
+        provider: "AWS",
+        aws_access_key_id: ApplicationConfig["AWS_UPLOAD_ID"],
+        aws_secret_access_key: ApplicationConfig["AWS_UPLOAD_SECRET"],
+        region: ApplicationConfig["AWS_UPLOAD_REGION"]
+      }
+      config.fog_directory = ApplicationConfig["AWS_UPLOAD_BUCKET_NAME"]
+    else
+      config.fog_credentials = {
+        provider: "AWS",
+        aws_access_key_id: ApplicationConfig["AWS_ID"],
+        aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
+        region: ApplicationConfig["AWS_DEFAULT_REGION"]
+      }
+      config.fog_directory = ApplicationConfig["AWS_BUCKET_NAME"]
+    end
     config.storage = :fog
   end
 end
diff --git a/config/sitemap.rb b/config/sitemap.rb
index 44f8dd0a0..f49e5ae3c 100644
--- a/config/sitemap.rb
+++ b/config/sitemap.rb
@@ -1,14 +1,25 @@
 if Rails.env.production?
-  SitemapGenerator::Sitemap.adapter = SitemapGenerator::S3Adapter.new(
-    fog_provider: "AWS",
-    aws_access_key_id: ApplicationConfig["AWS_ID"],
-    aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
-    fog_directory: ApplicationConfig["AWS_BUCKET_NAME"],
-    fog_region: ApplicationConfig["AWS_DEFAULT_REGION"],
-  )
+  if ENV["USE_NEW_AWS"]
+    SitemapGenerator::Sitemap.adapter = SitemapGenerator::S3Adapter.new(
+      fog_provider: "AWS",
+      aws_access_key_id: ApplicationConfig["AWS_UPLOAD_ID"],
+      aws_secret_access_key: ApplicationConfig["AWS_UPLOAD_SECRET"],
+      fog_directory: ApplicationConfig["AWS_UPLOAD_BUCKET_NAME"],
+      fog_region: ApplicationConfig["AWS_UPLOAD_REGION"],
+    )
+    SitemapGenerator::Sitemap.sitemaps_host = "https://#{ApplicationConfig['AWS_UPLOAD_BUCKET_NAME']}.s3.amazonaws.com/"
+  else
+    SitemapGenerator::Sitemap.adapter = SitemapGenerator::S3Adapter.new(
+      fog_provider: "AWS",
+      aws_access_key_id: ApplicationConfig["AWS_ID"],
+      aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
+      fog_directory: ApplicationConfig["AWS_BUCKET_NAME"],
+      fog_region: ApplicationConfig["AWS_DEFAULT_REGION"],
+    )
+    SitemapGenerator::Sitemap.sitemaps_host = "https://thepracticaldev.s3.amazonaws.com/"
+  end
 
   SitemapGenerator::Sitemap.public_path = "tmp/"
-  SitemapGenerator::Sitemap.sitemaps_host = "https://thepracticaldev.s3.amazonaws.com/"
   SitemapGenerator::Sitemap.sitemaps_path = "sitemaps/"
 end