diff --git a/.bundle/config b/.bundle/config
new file mode 100644
index 000000000..b64ad2111
--- /dev/null
+++ b/.bundle/config
@@ -0,0 +1,3 @@
+---
+BUNDLE_BUILD__NOKOGIRI: "--use-system-libraries"
+BUNDLE_BUILD__NOKOGUMBO: "--without-libxml2"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 53485a29a..592dac48b 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -64,7 +64,7 @@ jobs:
     - name: Install OS dependencies
       run: |
         apt-get update
-        apt-get -y install --no-install-recommends build-essential ruby ruby-dev ruby-bundler git nodejs yarnpkg webpack ffmpeg mkvtoolnix libvips-dev libxml2-dev postgresql-server-dev-all wget
+        apt-get -y install --no-install-recommends build-essential ruby ruby-dev ruby-bundler git nodejs yarnpkg webpack ffmpeg mkvtoolnix libvips-dev libxml2-dev libxslt-dev zlib1g-dev postgresql-server-dev-all wget
         ln -sf /usr/bin/yarnpkg /usr/bin/yarn
 
     - name: Install Ruby dependencies
diff --git a/.gitignore b/.gitignore
index 8f4292733..a51a3e83b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 .yarn-integrity
 .gitconfig
 .git/
-.bundle/
 config/database.yml
 config/danbooru_local_config.rb
 config/deploy/*.rb
diff --git a/Gemfile b/Gemfile
index ad30bc238..4304f26cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,9 +47,7 @@ gem 'http'
 gem 'activerecord-hierarchical_query'
 gem 'pundit'
 gem 'mail'
-
-# locked to 1.10.9 to workaround an incompatibility with nokogumbo 2.0.2.
-gem 'nokogiri', '~> 1.10.9'
+gem 'nokogiri'
 
 group :production, :staging do
   gem 'unicorn', :platforms => :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index c671469e6..338a3929b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -211,7 +211,7 @@ GEM
     mime-types-data (3.2020.0512)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.1)
     minitest-ci (3.4.0)
       minitest (>= 5.0.6)
@@ -239,10 +239,9 @@ GEM
     net-ssh (6.1.0)
     newrelic_rpm (6.11.0.365)
     nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.9-x64-mingw32)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.0.rc2)
+      mini_portile2 (~> 2.5.0)
+    nokogiri (1.11.0.rc2-x64-mingw32)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
     ntlm-http (0.1.1)
@@ -465,7 +464,7 @@ DEPENDENCIES
   mock_redis
   net-sftp
   newrelic_rpm
-  nokogiri (~> 1.10.9)
+  nokogiri
   oauth2
   pg
   pry-byebug
diff --git a/config/docker/Dockerfile.danbooru b/config/docker/Dockerfile.danbooru
index df2af68bd..013644a89 100644
--- a/config/docker/Dockerfile.danbooru
+++ b/config/docker/Dockerfile.danbooru
@@ -13,14 +13,20 @@ RUN \
     webpack \
     libvips-dev \
     libxml2-dev \
+    libxslt-dev \
+    zlib1g-dev \
     postgresql-server-dev-all && \
     # webpacker expects the binary to be called `yarn`, but debian/ubuntu installs it as `yarnpkg`.
     ln -sf /usr/bin/yarnpkg /usr/bin/yarn
 
 WORKDIR /build
 
+COPY .bundle .bundle
 COPY Gemfile Gemfile.lock ./
-RUN BUNDLE_DEPLOYMENT=true bundle install --jobs 4
+RUN \
+  bundle config set deployment true --local && \
+  bundle config set path vendor/bundle && \
+  bundle install --jobs 4
 
 COPY package.json yarn.lock ./
 RUN yarn install
@@ -44,6 +50,8 @@ RUN \
     mkvtoolnix \
     libvips \
     libxml2 \
+    libxslt1.1 \
+    zlib1g \
     postgresql-client
 
 USER danbooru