diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1eb57066fd..957d4624ef 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,6 +41,10 @@ jobs:
             gemfile: gemfiles/rails_6.1.gemfile
             orm: active_record
             adapter: postgresql
+          - ruby: 3.0
+            gemfile: gemfiles/rails_6.1.gemfile
+            orm: active_record
+            adapter: sqlite3
           - ruby: 2.6
             gemfile: gemfiles/rails_5.2.gemfile
             orm: mongoid
diff --git a/Appraisals b/Appraisals
index 1bc17e4e48..93d3a6eae5 100644
--- a/Appraisals
+++ b/Appraisals
@@ -5,6 +5,7 @@ appraise "rails-5.0" do
 
   group :test do
     gem 'cancancan', '~> 2.0'
+    gem 'paperclip', ['>= 3.4', '!= 4.3.0']
     gem 'shrine', '~> 2.13.0'
     gem 'shrine-memory'
   end
@@ -40,6 +41,7 @@ appraise "rails-5.1" do
 
   group :test do
     gem 'cancancan', '~> 2.0'
+    gem 'paperclip', ['>= 3.4', '!= 4.3.0']
     gem 'shrine', '~> 3.0'
   end
 
@@ -71,6 +73,7 @@ appraise "rails-5.2" do
 
   group :test do
     gem 'cancancan', '~> 2.0'
+    gem 'paperclip', ['>= 3.4', '!= 4.3.0']
     gem 'shrine', '~> 3.0'
   end
 
@@ -103,6 +106,7 @@ appraise "rails-6.0" do
 
   group :test do
     gem 'cancancan', '~> 3.0'
+    gem 'kt-paperclip'
     gem 'rspec-rails', '>= 4.0.0.beta2'
     gem 'shrine', '~> 3.0'
   end
@@ -129,13 +133,15 @@ appraise "rails-6.0" do
 end
 
 appraise "rails-6.1" do
-  gem 'rails', '~> 6.1.0.rc1'
+  gem 'rails', '~> 6.1.0'
   gem 'haml'
   gem 'sassc-rails', '~> 2.1'
   gem 'devise', '~> 4.7'
+  gem 'webrick', '~> 1.7'
 
   group :test do
-    gem 'cancancan', '~> 3.0', github: 'ghiculescu/cancancan', branch: 'avoid-resolve_column_aliases-2'
+    gem 'cancancan', '~> 3.2'
+    gem 'kt-paperclip'
     gem 'rspec-rails', '>= 4.0.0.beta2'
     gem 'shrine', '~> 3.0'
   end
diff --git a/Gemfile b/Gemfile
index bb651fdc42..42f96c2ea6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,15 +27,14 @@ group :test do
   gem 'generator_spec', '>= 0.8'
   gem 'launchy', '>= 2.2'
   gem 'mini_magick', '>= 3.4'
-  gem 'paperclip', ['>= 3.4', '!= 4.3.0']
   gem 'poltergeist', '~> 1.5'
   gem 'pundit'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-rails', '>= 2.14'
   gem 'rspec-expectations', '!= 3.8.3'
   gem 'rspec-retry'
-  gem 'rubocop', '~> 0.68.1'
-  gem 'rubocop-performance'
+  gem 'rubocop', '~> 0.68.1', require: false
+  gem 'rubocop-performance', require: false
   gem 'simplecov', '>= 0.9', require: false
   gem 'simplecov-lcov', require: false
   gem 'timecop', '>= 0.5'
diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
index 90d7e1c421..f4cce85278 100644
--- a/gemfiles/rails_5.0.gemfile
+++ b/gemfiles/rails_5.0.gemfile
@@ -36,19 +36,19 @@ group :test do
   gem "generator_spec", ">= 0.8"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
-  gem "paperclip", [">= 3.4", "!= 4.3.0"]
   gem "poltergeist", "~> 1.5"
   gem "pundit"
   gem "rack-cache", require: "rack/cache"
   gem "rspec-rails", ">= 2.14"
   gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-retry"
-  gem "rubocop", "~> 0.68.1"
-  gem "rubocop-performance"
+  gem "rubocop", "~> 0.68.1", require: false
+  gem "rubocop-performance", require: false
   gem "simplecov", ">= 0.9", require: false
   gem "simplecov-lcov", require: false
   gem "timecop", ">= 0.5"
   gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+  gem "paperclip", [">= 3.4", "!= 4.3.0"]
   gem "shrine", "~> 2.13.0"
   gem "shrine-memory"
 
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
index 4d933f62b4..2ffc3b516a 100644
--- a/gemfiles/rails_5.1.gemfile
+++ b/gemfiles/rails_5.1.gemfile
@@ -37,19 +37,19 @@ group :test do
   gem "generator_spec", ">= 0.8"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
-  gem "paperclip", [">= 3.4", "!= 4.3.0"]
   gem "poltergeist", "~> 1.5"
   gem "pundit"
   gem "rack-cache", require: "rack/cache"
   gem "rspec-rails", ">= 2.14"
   gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-retry"
-  gem "rubocop", "~> 0.68.1"
-  gem "rubocop-performance"
+  gem "rubocop", "~> 0.68.1", require: false
+  gem "rubocop-performance", require: false
   gem "simplecov", ">= 0.9", require: false
   gem "simplecov-lcov", require: false
   gem "timecop", ">= 0.5"
   gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+  gem "paperclip", [">= 3.4", "!= 4.3.0"]
   gem "shrine", "~> 3.0"
 
   platforms :ruby_19 do
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
index 5c06eda72e..77114acb11 100644
--- a/gemfiles/rails_5.2.gemfile
+++ b/gemfiles/rails_5.2.gemfile
@@ -37,19 +37,19 @@ group :test do
   gem "generator_spec", ">= 0.8"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
-  gem "paperclip", [">= 3.4", "!= 4.3.0"]
   gem "poltergeist", "~> 1.5"
   gem "pundit"
   gem "rack-cache", require: "rack/cache"
   gem "rspec-rails", ">= 2.14"
   gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-retry"
-  gem "rubocop", "~> 0.68.1"
-  gem "rubocop-performance"
+  gem "rubocop", "~> 0.68.1", require: false
+  gem "rubocop-performance", require: false
   gem "simplecov", ">= 0.9", require: false
   gem "simplecov-lcov", require: false
   gem "timecop", ">= 0.5"
   gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+  gem "paperclip", [">= 3.4", "!= 4.3.0"]
   gem "shrine", "~> 3.0"
 
   platforms :ruby_19 do
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
index 3d3ce65ea4..19e0fbc54c 100644
--- a/gemfiles/rails_6.0.gemfile
+++ b/gemfiles/rails_6.0.gemfile
@@ -37,19 +37,19 @@ group :test do
   gem "generator_spec", ">= 0.8"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
-  gem "paperclip", [">= 3.4", "!= 4.3.0"]
   gem "poltergeist", "~> 1.5"
   gem "pundit"
   gem "rack-cache", require: "rack/cache"
   gem "rspec-rails", ">= 4.0.0.beta2"
   gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-retry"
-  gem "rubocop", "~> 0.68.1"
-  gem "rubocop-performance"
+  gem "rubocop", "~> 0.68.1", require: false
+  gem "rubocop-performance", require: false
   gem "simplecov", ">= 0.9", require: false
   gem "simplecov-lcov", require: false
   gem "timecop", ">= 0.5"
   gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+  gem "kt-paperclip"
   gem "shrine", "~> 3.0"
 
   platforms :ruby_19 do
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
index 023e9749a2..c3a116ca2c 100644
--- a/gemfiles/rails_6.1.gemfile
+++ b/gemfiles/rails_6.1.gemfile
@@ -3,10 +3,11 @@
 source "https://rubygems.org"
 
 gem "appraisal", ">= 2.0"
-gem "rails", "~> 6.1.0.rc1"
+gem "rails", "~> 6.1.0"
 gem "haml"
 gem "devise", "~> 4.7"
 gem "sassc-rails", "~> 2.1"
+gem "webrick", "~> 1.7"
 
 group :active_record do
   gem "paper_trail", ">= 5.0"
@@ -23,7 +24,7 @@ group :development, :test do
 end
 
 group :test do
-  gem "cancancan", "~> 3.0", github: "ghiculescu/cancancan", branch: "avoid-resolve_column_aliases-2"
+  gem "cancancan", "~> 3.2"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
   gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0", "< 2.0"]
   gem "dragonfly", "~> 1.0"
@@ -31,19 +32,19 @@ group :test do
   gem "generator_spec", ">= 0.8"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
-  gem "paperclip", [">= 3.4", "!= 4.3.0"]
   gem "poltergeist", "~> 1.5"
   gem "pundit"
   gem "rack-cache", require: "rack/cache"
   gem "rspec-rails", ">= 4.0.0.beta2"
   gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-retry"
-  gem "rubocop", "~> 0.68.1"
-  gem "rubocop-performance"
+  gem "rubocop", "~> 0.68.1", require: false
+  gem "rubocop-performance", require: false
   gem "simplecov", ">= 0.9", require: false
   gem "simplecov-lcov", require: false
   gem "timecop", ">= 0.5"
   gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+  gem "kt-paperclip"
   gem "shrine", "~> 3.0"
 
   platforms :ruby_19 do