diff --git a/Gemfile b/Gemfile
index 4eb06437..789f5f77 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'rails-observers'
 gem 'paper_trail'
 
 # for upload management
-gem 'paperclip'
+gem 'carrierwave'
 
 # for internationalizing
 gem 'rails-i18n', '~> 4.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 67214667..28b8c64e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -94,6 +94,11 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    carrierwave (0.11.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
@@ -102,14 +107,10 @@ GEM
     chart-js-rails (0.0.6)
       railties (> 3.1)
     chronic (0.10.2)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
     cliver (0.3.2)
     cloudinary (1.1.6)
       aws_cf_signer
       rest-client
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
     cocoon (1.2.6)
     coderay (1.1.0)
     coffee-rails (4.1.1)
@@ -236,7 +237,6 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.99.1)
-    mimemagic (0.3.0)
     mina (0.3.8)
       open4 (~> 1.3.4)
       rake
@@ -292,12 +292,6 @@ GEM
     paper_trail (3.0.1)
       activerecord (>= 3.0, < 5.0)
       activesupport (>= 3.0, < 5.0)
-    paperclip (4.3.2)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      cocaine (~> 0.5.5)
-      mime-types
-      mimemagic (= 0.3.0)
     parser (2.3.0.3)
       ast (~> 2.2)
     pdf-core (0.2.5)
@@ -526,6 +520,7 @@ DEPENDENCIES
   byebug
   cancancan
   capybara
+  carrierwave
   chart-js-rails
   cloudinary
   cocoon
@@ -558,7 +553,6 @@ DEPENDENCIES
   omniauth-google-oauth2
   omniauth-openid
   paper_trail
-  paperclip
   phantomjs
   piwik_analytics (~> 1.0.1)
   poltergeist