diff --git a/Gemfile b/Gemfile
index 6f846d0ad4..c3dba34ad5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'redis',                   '3.3.0'
 gem 'hiredis',                 '0.6.1'
 gem 'nokogiri',                '~> 1.6.6.2'
 gem 'statsd-client',           '0.0.7', require: 'statsd'
-gem 'aws-sdk',                 '1.8.5'
+gem 'aws-sdk-s3',              '~> 1'
 gem 'ruby-prof',               '0.15.1'
 gem 'request_store',           '1.1.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 8728a2886c..cc77ca88cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -49,10 +49,19 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (1.8.5)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-      uuidtools (~> 2.1)
+    aws-partitions (1.72.0)
+    aws-sdk-core (3.17.1)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.5.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.8.2)
+      aws-sdk-core (~> 3)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -155,6 +164,7 @@ GEM
       faraday_middleware (>= 0.8, < 0.10)
       hashie (>= 0.4.0)
       multi_json (~> 1.0, >= 1.0.3)
+    jmespath (1.3.1)
     journey (1.0.4)
     json (1.8.6)
     json-schema (2.1.9)
@@ -367,7 +377,7 @@ DEPENDENCIES
   activerecord-postgresql-adapter
   addressable (= 2.3.2)
   analytics-ruby (~> 2.0.0)
-  aws-sdk (= 1.8.5)
+  aws-sdk-s3 (~> 1)
   bartt-ssl_requirement (~> 1.4.0)
   byebug
   capybara (= 1.1.2)
@@ -441,4 +451,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.14.6
+   1.15.1