diff --git a/Gemfile b/Gemfile
index aeff8fbc2048423c5f711263d4939f6b70d00492..24588ab7dbe698e52d3285b158f4c5bb10b26b42 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,7 +79,7 @@ gem "activerecord-import", "1.1.0"
 
 # File uploading
 
-gem "carrierwave", "1.3.2"
+gem "carrierwave", "2.2.2"
 gem "fog-aws",     "3.5.2"
 gem "mini_magick", "4.10.1"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ad480a5a0c0e24abfb9a0a745f3e8561ccc7ed5..9e4b40448754870920d75d90fa162b22d5d99cd5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,10 +89,13 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (1.3.2)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
+    carrierwave (2.2.2)
+      activemodel (>= 5.0.0)
+      activesupport (>= 5.0.0)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      marcel (~> 1.0.0)
+      mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
     celluloid (0.17.4)
       celluloid-essentials
@@ -340,6 +343,9 @@ GEM
       actionpack (>= 3.0.0)
       i18n-inflector (~> 2.6)
       railties (>= 3.0.0)
+    image_processing (1.12.1)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     ipaddress (0.8.3)
     jasmine (3.7.0)
       jasmine-core (~> 3.7.0)
@@ -658,6 +664,8 @@ GEM
       rubocop (>= 0.90.0, < 2.0)
     ruby-oembed (0.12.0)
     ruby-progressbar (1.11.0)
+    ruby-vips (2.1.2)
+      ffi (~> 1.12)
     rubyzip (2.3.0)
     rugged (1.0.1)
     sass (3.4.25)
@@ -799,7 +807,7 @@ DEPENDENCIES
   bootstrap-sass (= 3.4.1)
   bootstrap-switch-rails (= 3.3.3)
   capybara (= 3.35.3)
-  carrierwave (= 1.3.2)
+  carrierwave (= 2.2.2)
   chrome_remote (= 0.3.0)
   compass-rails (= 3.1.0)
   configurate (= 0.5.0)
diff --git a/app/uploaders/exported_user.rb b/app/uploaders/exported_user.rb
index 53201d9186f5f41537fd93bfd5ae45105937ea02..3fc0172e6bddf263024263fce1354437a840fe22 100644
--- a/app/uploaders/exported_user.rb
+++ b/app/uploaders/exported_user.rb
@@ -9,7 +9,7 @@ class ExportedUser < SecureUploader
     "uploads/users"
   end
 
-  def extension_whitelist
+  def extension_allowlist
     %w[gz]
   end
 
diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb
index 9d614f466fe16e6102cb378d766f70d53cc13f46..79b61b9c7ab5870a847b403e55b61576e250e6a4 100644
--- a/app/uploaders/processed_image.rb
+++ b/app/uploaders/processed_image.rb
@@ -11,7 +11,7 @@ class ProcessedImage < CarrierWave::Uploader::Base
     "uploads/images"
   end
 
-  def extension_whitelist
+  def extension_allowlist
     %w[jpg jpeg png gif]
   end
 
diff --git a/app/uploaders/unprocessed_image.rb b/app/uploaders/unprocessed_image.rb
index b662f3b408304a5fba7dc030d96689bbbde0bf42..6dad5f602b6e92dd4a21249cf5a22ffe4072ad57 100644
--- a/app/uploaders/unprocessed_image.rb
+++ b/app/uploaders/unprocessed_image.rb
@@ -17,7 +17,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base
     "uploads/images"
   end
 
-  def extension_whitelist
+  def extension_allowlist
     %w[jpg jpeg png gif]
   end
 
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 3b0119590deeffcd5e7cf94a2679781c779c631b..4a212ad1116f033287d456adb7ba6122b5e357fd 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -8,9 +8,9 @@
 ENV['SSL_CERT_FILE'] = AppConfig.environment.certificate_authorities.get
 CarrierWave.configure do |config|
   if !Rails.env.test? && AppConfig.environment.s3.enable?
-    config.fog_provider = "fog/aws"
     require "carrierwave/storage/fog"
     config.storage = :fog
+    config.cache_storage = :file
     config.cache_dir = Rails.root.join('tmp', 'uploads').to_s
     config.fog_credentials = {
         provider:              'AWS',