diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 598846f071..c3fe0cbdbf 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -34,9 +34,10 @@ jobs:
     runs-on: ubuntu-latest
     name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} ${{ matrix.additional_name }})
     strategy:
+      fail-fast: false
       matrix:
         ruby: ["3.3"]
-        rails_version: ["7.1.3.4", "7.2.0"]
+        rails_version: ["7.1.5.1", "7.2.2.1"]
         bootstrap_version: [null]
         view_component_version: ["~> 3.12"]
         api: [null]
@@ -44,33 +45,39 @@ jobs:
         additional_name: [""]
         include:
           - ruby: "3.3"
-            rails_version: "8.0.0"
+            rails_version: "8.0.1"
             additional_engine_cart_rails_options: --css=bootstrap
+          - ruby: "3.3"
+            rails_version: "8.0.1"
+            additional_engine_cart_rails_options: --css=bootstrap --js=esbuild
+            additional_name: "/ esbuild"
           - ruby: "3.2"
-            rails_version: "6.1.7.8"
-          - ruby: "3.2"
-            rails_version: "7.1.3.4"
+            rails_version: "7.1.5.1"
             solr_version: "8.11.2"
             additional_name: "Solr 8.11.2"
           - ruby: "3.1"
-            rails_version: "7.1.3.4"
+            rails_version: "7.1.5.1"
           - ruby: "3.1"
-            rails_version: "7.1.3.4"
+            rails_version: "7.1.5.1"
             view_component_version: "~> 2.74"
             additional_name: "/ ViewComponent 2"
           - ruby: "3.1"
-            rails_version: "7.1.3.4"
+            rails_version: "7.1.5.1"
             additional_name: "/ Propshaft"
             additional_engine_cart_rails_options: -a propshaft --css=bootstrap
           - ruby: "3.1"
-            rails_version: "7.1.3.4"
+            rails_version: "7.1.5.1"
             bootstrap_version: "~> 4.0"
             additional_name: "/ Bootstrap 4"
           - ruby: "3.3"
-            rails_version: "7.1.3.4"
+            rails_version: "7.1.5.1"
             api: "true"
             additional_engine_cart_rails_options: --api --skip-yarn
             additional_name: "/ API"
+          - ruby: "3.3"
+            rails_version: "7.2.2.1"
+            additional_engine_cart_rails_options: -a propshaft --css=bootstrap --js=esbuild
+            additional_name: "/ Propshaft, esbuild"
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       SOLR_VERSION: ${{ matrix.solr_version || 'latest' }}
diff --git a/compose.yaml b/compose.yaml
index ed8dc9669d..5244dd084e 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -23,6 +23,7 @@ services:
     environment:
       - SOLR_PORT # Set via environment variable or use default defined in .env file
       - SOLR_VERSION # Set via environment variable or use default defined in .env file
+      - SOLR_MODULES=analysis-extras
     image: "solr:${SOLR_VERSION}"
     volumes:
       - $PWD/lib/generators/blacklight/templates/solr/conf:/opt/solr/conf
diff --git a/lib/generators/blacklight/templates/solr/conf/solrconfig.xml b/lib/generators/blacklight/templates/solr/conf/solrconfig.xml
index fe693e6c9c..f140fac4b4 100644
--- a/lib/generators/blacklight/templates/solr/conf/solrconfig.xml
+++ b/lib/generators/blacklight/templates/solr/conf/solrconfig.xml
@@ -16,7 +16,7 @@
     </updateLog>
   </updateHandler>
 
-  <!-- solr lib dirs -->
+  <!-- solr lib dirs, which are needed for Solr 8 compatibility but ignored in solr 9.8 and above -->
   <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />