diff --git a/.github/workflows/build-solr.yaml b/.github/workflows/build-solr.yaml
index f7f4e93..14e8628 100644
--- a/.github/workflows/build-solr.yaml
+++ b/.github/workflows/build-solr.yaml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    uses: notch8/actions/.github/workflows/build.yaml@v1.0.4
+    uses: notch8/actions/.github/workflows/build.yaml@v1.0.8
     secrets: inherit
     with:
       platforms: "linux/amd64"
diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml
index 164524e..33c820b 100644
--- a/.github/workflows/build-test-lint.yaml
+++ b/.github/workflows/build-test-lint.yaml
@@ -22,7 +22,7 @@ on:
 
 jobs:
   build:
-    uses: notch8/actions/.github/workflows/build.yaml@v1.0.4
+    uses: notch8/actions/.github/workflows/build.yaml@v1.0.8
     secrets: inherit
     with:
       platforms: "linux/amd64"
@@ -31,14 +31,14 @@ jobs:
 
   test:
     needs: build
-    uses: notch8/actions/.github/workflows/test.yaml@v1.0.4
+    uses: notch8/actions/.github/workflows/test.yaml@v1.0.8
     with:
       confdir: '/app/samvera/hyrax-webapp/solr/conf'
       rspec_cmd: "cd .. && gem install semaphore_test_boosters && bundle && rspec_booster --job $CI_NODE_INDEX/$CI_NODE_TOTAL"
 
   lint:
     needs: build
-    uses: notch8/actions/.github/workflows/lint.yaml@v1.0.4
+    uses: notch8/actions/.github/workflows/lint.yaml@v1.0.8
     with:
       webTarget: hyku-web
       workerTarget: hyku-worker
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index a73a5c4..40a9cc8 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -18,5 +18,5 @@ on:
 
 jobs:
   deploy:
-    uses: notch8/actions/.github/workflows/deploy.yaml@v1.0.4
+    uses: notch8/actions/.github/workflows/deploy.yaml@v1.0.8
     secrets: inherit
diff --git a/hyrax-webapp b/hyrax-webapp
index 9e2525a..d950398 160000
--- a/hyrax-webapp
+++ b/hyrax-webapp
@@ -1 +1 @@
-Subproject commit 9e2525a1d9a2a5257831493f30f1a435069af4bf
+Subproject commit d950398d1c5f93590552defee1c5c62f112ddd51
diff --git a/lib/blacklight_advanced_search/render_constraints_override_decorator.rb b/lib/blacklight_advanced_search/render_constraints_override_decorator.rb
index 7dc2226..3ce1921 100644
--- a/lib/blacklight_advanced_search/render_constraints_override_decorator.rb
+++ b/lib/blacklight_advanced_search/render_constraints_override_decorator.rb
@@ -11,4 +11,14 @@ def render_constraints_filters(params_or_search_state = search_state)
   end
 end
 
-BlacklightAdvancedSearch::RenderConstraintsOverride.prepend(BlacklightAdvancedSearch::RenderConstraintsOverrideDecorator)
+if defined?(BlacklightAdvancedSearch::RenderConstraintsOverride)
+  # blacklight_advanced_search <= 7 (old hook point)
+  BlacklightAdvancedSearch::RenderConstraintsOverride.prepend(
+    BlacklightAdvancedSearch::RenderConstraintsOverrideDecorator
+  )
+elsif defined?(Blacklight::RenderConstraintsHelperBehavior)
+  # blacklight_advanced_search 8+ (RenderConstraintsOverride removed/renamed)
+  Blacklight::RenderConstraintsHelperBehavior.prepend(
+    BlacklightAdvancedSearch::RenderConstraintsOverrideDecorator
+  )
+end