diff --git a/Gemfile b/Gemfile
index 19ef397bb6..88cc5b7d83 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ gem "react-rails", "~> 3.0.0"
 gem "select2-rails", "~> 4.0"
 gem "spinjs-rails", "~> 1.3.0" # Breaking changes in v1.4 (spin.js v2.0).
 gem "uglifier", "~> 4.2"
-gem "shakapacker", "~> 7.0"
+gem "shakapacker", "~> 8.0.0"
 
 # Authz and Authn
 gem "authlogic", "~> 6.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 574cab6ede..3e476a33db 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -598,7 +598,7 @@ GEM
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     sexp_processor (4.17.2)
-    shakapacker (7.2.3)
+    shakapacker (8.0.1)
       activesupport (>= 5.2)
       package_json
       rack-proxy (>= 0.6.1)
@@ -772,7 +772,7 @@ DEPENDENCIES
   selenium-webdriver (~> 4.15.0)
   sentry-rails (~> 5.0)
   sentry-ruby (~> 5.0)
-  shakapacker (~> 7.0)
+  shakapacker (~> 8.0.0)
   spinjs-rails (~> 1.3.0)
   spreadsheet
   sprockets
diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js
index 4a27af61d4..c29dd307fc 100644
--- a/config/webpack/webpack.config.js
+++ b/config/webpack/webpack.config.js
@@ -1,7 +1,7 @@
-const { globalMutableWebpackConfig: webpackConfig, merge } = require('shakapacker')
+const { generateWebpackConfig, merge } = require('shakapacker')
 
 module.exports = merge(
-  webpackConfig,
+  generateWebpackConfig(),
   {
     rules: [
       {
@@ -15,5 +15,3 @@ module.exports = merge(
     ]
   }
 )
-
-module.exports = webpackConfig
diff --git a/package.json b/package.json
index fd85a3a5f4..ae6830d9bd 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,5 @@
 {
+  "packageManager": "yarn@1.22.x",
   "scripts": {
     "i18n:export": "bundle exec rake i18n:js:export",
     "test": "jest",
@@ -74,7 +75,7 @@
     "react-with-direction": "^1.3.1",
     "react_ujs": "2.6.1",
     "regenerator-runtime": "0.13.9",
-    "shakapacker": "^ 7.0.0",
+    "shakapacker": "~ 8.0.0",
     "style-loader": "1.2.1",
     "terser-webpack-plugin": "^5.3.10",
     "webpack": "^5.53.0",
diff --git a/yarn.lock b/yarn.lock
index 70939ec632..0ecb3ff7bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4271,7 +4271,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
+glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -7223,12 +7223,11 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-"shakapacker@^ 7.0.0":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.2.3.tgz#12613e8ca3139e47d42003f8d01846dea28f6c40"
-  integrity sha512-+qF74Y6+hEARqtsmJmBtdc2L0q6eXO21PlPsvtw6aqoxtqhM2VpCCDt51/5Cqnj/5IyEOEICZqStRCSO/q38hg==
+"shakapacker@~ 8.0.0":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-8.0.1.tgz#96c893ccc414d47aaf86689eb5ef732259c592c7"
+  integrity sha512-VjIWgJqh4680Kf2NSmupB3h6dWxlOkGvceJJuJZ0az/6wUL5d/ovmKUc2swrpWC8UgBY67YjXI92zT07EQevbQ==
   dependencies:
-    glob "^7.2.0"
     js-yaml "^4.1.0"
     path-complete-extname "^1.0.0"