diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b6c13d33..3dc212bc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,11 +17,12 @@ jobs:
     strategy:
       matrix:
         java-version: [8, 21, 25]
-        ruby-version: [jruby-9.4, jruby-10.0]
+        ruby-version: [jruby-9.4, jruby-10.0, jruby-10.1]
         task: ['', integration]
         exclude:
-          # JRuby 10 requires Java 21 minimum
-          - ruby-version: jruby-10.0
+          - ruby-version: jruby-10.0  # JRuby 10 requires Java 21 minimum
+            java-version: 8
+          - ruby-version: jruby-10.1  # JRuby 10 requires Java 21 minimum
             java-version: 8
 
       fail-fast: false
@@ -50,7 +51,7 @@ jobs:
         run: gem uninstall -a jruby-launcher
 
       - name: Install dependencies
-        run: bundle install
+        run: BUNDLE_JOBS=1 bundle install
 
       - name: Run tests
         run: bundle exec rake ${{ matrix.task }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99fb00ad..2c07ccfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 2.1.1 (UNRELEASED)
 
+- #623: fix: ensure compatibility with JRuby 10.1
 - #583: fix: Create config dir if it's missing for simpler usage
 - #588: fix: NullPointerException during shutdown with executable war files
 - #589: fix: Jetty wars don't have console logging enabled by default
diff --git a/Gemfile b/Gemfile
index 1434347b..5be2399e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,4 +9,6 @@ group :development, :test do
     # force jruby-jars to use current JRuby version for testing
     gem 'jruby-jars', '~> ' + JRUBY_VERSION.split('.')[0..2].join('.')
   end
+
+  gem 'jbundler', github: "jruby/jbundler", ref: "refs/pull/108/head" # FIXME needs jbundler 0.9.6 release
 end
diff --git a/warbler.gemspec b/warbler.gemspec
index f31966c8..367a4e80 100644
--- a/warbler.gemspec
+++ b/warbler.gemspec
@@ -32,7 +32,7 @@ bundle up all of your application files for deployment to a Java environment.}
 
   gem.add_runtime_dependency 'rake', ['~> 13.0', '>= 13.0.3']
   gem.add_runtime_dependency 'rexml', '~> 3.0'
-  gem.add_runtime_dependency 'jruby-jars', ['>= 9.4', '< 10.1']
+  gem.add_runtime_dependency 'jruby-jars', ['>= 9.4', '< 10.2']
   gem.add_runtime_dependency 'jruby-rack', ['>= 1.2.6', '< 1.4']
   gem.add_runtime_dependency 'rubyzip', ['>= 2.1.0', '< 4']
   gem.add_runtime_dependency 'ostruct', '~> 0.6.2'