diff --git a/Gemfile b/Gemfile
index b09e37d..7700f4f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,6 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gemspec
 
-gem 'fastimage'
 gem 'pg'
 
 gem 'aws-sdk-s3'
@@ -22,8 +21,6 @@ gem 'thoughtbot-shoulda', '>= 2.9.0'
 gem 'pry'
 gem 'pry-byebug'
 
-gem 'addressable'
-
 unless defined?(Appraisal)
   gem 'appraisal'
 
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..aae4a88
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,12 @@
+version: '3.6'
+
+services:
+  postgres:
+    image: postgres:12-alpine
+    environment:
+      POSTGRES_DB: paperclip_test
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: ""
+      POSTGRES_HOST_AUTH_METHOD: trust
+    ports:
+      - 5432:5432
diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile
index 7483901..fa45414 100644
--- a/gemfiles/rails_60.gemfile
+++ b/gemfiles/rails_60.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "fastimage"
 gem "pg"
 gem "aws-sdk-s3"
 gem "fog-local"
@@ -14,6 +13,5 @@ gem "mocha"
 gem "thoughtbot-shoulda", ">= 2.9.0"
 gem "pry"
 gem "pry-byebug"
-gem "addressable"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile
index 0c0d359..32f9ec2 100644
--- a/gemfiles/rails_61.gemfile
+++ b/gemfiles/rails_61.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "fastimage"
 gem "pg"
 gem "aws-sdk-s3"
 gem "fog-local"
@@ -14,6 +13,5 @@ gem "mocha"
 gem "thoughtbot-shoulda", ">= 2.9.0"
 gem "pry"
 gem "pry-byebug"
-gem "addressable"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_70.gemfile b/gemfiles/rails_70.gemfile
index c1b94b7..7a1b3de 100644
--- a/gemfiles/rails_70.gemfile
+++ b/gemfiles/rails_70.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "fastimage"
 gem "pg"
 gem "aws-sdk-s3"
 gem "fog-local"
@@ -14,6 +13,5 @@ gem "mocha"
 gem "thoughtbot-shoulda", ">= 2.9.0"
 gem "pry"
 gem "pry-byebug"
-gem "addressable"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_71.gemfile b/gemfiles/rails_71.gemfile
index e5e35d6..cf2e45a 100644
--- a/gemfiles/rails_71.gemfile
+++ b/gemfiles/rails_71.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "fastimage"
 gem "pg"
 gem "aws-sdk-s3"
 gem "fog-local"
@@ -14,6 +13,5 @@ gem "mocha"
 gem "thoughtbot-shoulda", ">= 2.9.0"
 gem "pry"
 gem "pry-byebug"
-gem "addressable"
 
 gemspec path: "../"
diff --git a/paperclip.gemspec b/paperclip.gemspec
index 21cfcdb..56ab4ac 100644
--- a/paperclip.gemspec
+++ b/paperclip.gemspec
@@ -8,7 +8,10 @@ Gem::Specification.new do |s|
   s.date = %q{2009-06-18}
   s.email = %q{jyurek@thoughtbot.com}
   s.extra_rdoc_files = ["README.rdoc"]
-  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|gemfiles)/}) }
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.start_with?('.') || f.match?(%r{^(test|gemfiles)/}) ||
+      f.match?(%r{docker-compose.yml|Appraisals|Gemfile|Rakefile})
+  end
   s.homepage = %q{http://www.thoughtbot.com/projects/paperclip}
   s.rdoc_options = ["--line-numbers", "--inline-source"]
   s.require_paths = ["lib"]