diff --git a/.erb-lint.yml b/.erb_lint.yml
similarity index 100%
rename from .erb-lint.yml
rename to .erb_lint.yml
diff --git a/Gemfile b/Gemfile
index 596644d0..3d6f26ec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ rails_versions = {
   "7.0" => "~> 7.0.1", # Ruby 3.1 requires Rails 7.0.1+
   "7.1" => "~> 7.1.0",
   "7.2" => "~> 7.2.0",
-  "8.0" => "~> 8.0.0.a",
+  "8.0" => "~> 8.0.0",
   "head" => { github: "rails/rails", branch: "main" },
 }
 gem 'rails', rails_versions[ENV.fetch("RAILS_VERSION", nil)]
diff --git a/Gemfile.lock b/Gemfile.lock
index f6b7a945..9845117c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,114 +12,110 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.5)
-      actionpack (= 7.1.5)
-      activesupport (= 7.1.5)
+    actioncable (8.0.0)
+      actionpack (= 8.0.0)
+      activesupport (= 8.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.5)
-      actionpack (= 7.1.5)
-      activejob (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.5)
-      actionpack (= 7.1.5)
-      actionview (= 7.1.5)
-      activejob (= 7.1.5)
-      activesupport (= 7.1.5)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (8.0.0)
+      actionpack (= 8.0.0)
+      activejob (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
+      mail (>= 2.8.0)
+    actionmailer (8.0.0)
+      actionpack (= 8.0.0)
+      actionview (= 8.0.0)
+      activejob (= 8.0.0)
+      activesupport (= 8.0.0)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5)
-      actionview (= 7.1.5)
-      activesupport (= 7.1.5)
+    actionpack (8.0.0)
+      actionview (= 8.0.0)
+      activesupport (= 8.0.0)
       nokogiri (>= 1.8.5)
-      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5)
-      actionpack (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
+      useragent (~> 0.16)
+    actiontext (8.0.0)
+      actionpack (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.5)
-      activesupport (= 7.1.5)
+    actionview (8.0.0)
+      activesupport (= 8.0.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.5)
-      activesupport (= 7.1.5)
+    activejob (8.0.0)
+      activesupport (= 8.0.0)
       globalid (>= 0.3.6)
-    activemodel (7.1.5)
-      activesupport (= 7.1.5)
-    activerecord (7.1.5)
-      activemodel (= 7.1.5)
-      activesupport (= 7.1.5)
+    activemodel (8.0.0)
+      activesupport (= 8.0.0)
+    activerecord (8.0.0)
+      activemodel (= 8.0.0)
+      activesupport (= 8.0.0)
       timeout (>= 0.4.0)
     activerecord-explain-analyze (0.1.0)
       activerecord (>= 4)
       pg
-    activerecord-jdbc-adapter (70.2-java)
-      activerecord (~> 7.0)
-    activerecord-jdbcpostgresql-adapter (70.2-java)
-      activerecord-jdbc-adapter (= 70.2)
-      jdbc-postgres (>= 9.4, < 43)
-    activestorage (7.1.5)
-      actionpack (= 7.1.5)
-      activejob (= 7.1.5)
-      activerecord (= 7.1.5)
-      activesupport (= 7.1.5)
+    activerecord-jdbc-adapter (1.3.22)
+      activerecord (>= 2.2)
+    activerecord-jdbcpostgresql-adapter (1.3.22)
+      activerecord-jdbc-adapter (~> 1.3.22)
+      jdbc-postgres (>= 9.1)
+    activestorage (8.0.0)
+      actionpack (= 8.0.0)
+      activejob (= 8.0.0)
+      activerecord (= 8.0.0)
+      activesupport (= 8.0.0)
       marcel (~> 1.0)
-    activesupport (7.1.5)
+    activesupport (8.0.0)
       base64
       benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
       securerandom (>= 0.3)
-      tzinfo (~> 2.0)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    async (2.14.2)
-      console (~> 1.25, >= 1.25.2)
+    async (2.20.0)
+      console (~> 1.29)
       fiber-annotation
       io-event (~> 1.6, >= 1.6.5)
-    async-http (0.69.0)
+    async-http (0.83.1)
       async (>= 2.10.2)
-      async-pool (~> 0.7)
-      io-endpoint (~> 0.11)
-      io-stream (~> 0.4)
-      protocol-http (~> 0.26)
-      protocol-http1 (~> 0.19)
-      protocol-http2 (~> 0.18)
-      traces (>= 0.10)
-    async-http-faraday (0.14.0)
+      async-pool (~> 0.9)
+      io-endpoint (~> 0.14)
+      io-stream (~> 0.6)
+      metrics (~> 0.12)
+      protocol-http (~> 0.43)
+      protocol-http1 (>= 0.28.1)
+      protocol-http2 (~> 0.19)
+      traces (~> 0.10)
+    async-http-faraday (0.19.0)
       async-http (~> 0.42)
       faraday
-    async-pool (0.7.0)
+    async-pool (0.10.1)
       async (>= 1.25)
+      traces
     base64 (0.2.0)
-    benchmark (0.3.0)
+    benchmark (0.4.0)
     benchmark-ips (2.14.0)
     better_html (2.1.1)
       actionview (>= 6.0)
@@ -148,7 +144,7 @@ GEM
       concurrent-ruby
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    console (1.26.0)
+    console (1.29.0)
       fiber-annotation
       fiber-local (~> 1.1)
       json
@@ -177,12 +173,13 @@ GEM
     erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
-    faraday (2.10.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
       logger
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
-    faraday-net_http (3.1.0)
+    faraday-net_http (3.3.0)
       net-http
     ffi (1.17.0-arm64-darwin)
     ffi (1.17.0-java)
@@ -191,7 +188,7 @@ GEM
     fiber-annotation (0.2.0)
     fiber-local (1.1.0)
       fiber-storage
-    fiber-storage (0.1.2)
+    fiber-storage (1.0.0)
     foreman (0.88.1)
     fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
@@ -208,7 +205,7 @@ GEM
       rake (>= 10.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    highline (3.1.0)
+    highline (3.1.1)
       reline
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
@@ -224,16 +221,16 @@ GEM
       terminal-table (>= 1.5.1)
     io-console (0.7.2)
     io-console (0.7.2-java)
-    io-endpoint (0.13.0)
-    io-event (1.6.5)
-    io-stream (0.4.0)
+    io-endpoint (0.14.0)
+    io-event (1.7.3)
+    io-stream (0.6.1)
     irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jar-dependencies (0.4.1)
     jdbc-postgres (42.6.0)
-    json (2.7.5)
-    json (2.7.5-java)
+    json (2.8.1)
+    json (2.8.1-java)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -256,21 +253,21 @@ GEM
       mixlib-cli (~> 2.1, >= 2.1.1)
       mixlib-config (>= 2.2.1, < 4)
       mixlib-shellout
-    memory_profiler (1.0.2)
+    memory_profiler (1.1.0)
+    metrics (0.12.1)
     mini_mime (1.1.5)
     minitest (5.25.1)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
-    mixlib-shellout (3.2.8)
+    mixlib-shellout (3.3.4)
       chef-utils
     msgpack (1.7.3)
     msgpack (1.7.3-java)
     multi_json (1.15.0)
-    mutex_m (0.2.0)
-    net-http (0.4.1)
+    net-http (0.5.0)
       uri
-    net-imap (0.4.17)
+    net-imap (0.5.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -295,23 +292,23 @@ GEM
       sawyer (~> 0.9)
     optimist (3.1.0)
     parallel (1.26.3)
-    parser (3.3.5.1)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
     prism (1.2.0)
-    protocol-hpack (1.4.3)
-    protocol-http (0.27.0)
-    protocol-http1 (0.19.1)
+    protocol-hpack (1.5.1)
+    protocol-http (0.43.0)
+    protocol-http1 (0.28.1)
       protocol-http (~> 0.22)
-    protocol-http2 (0.18.0)
+    protocol-http2 (0.20.0)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
-    psych (5.1.2)
+    psych (5.2.0)
       stringio
-    psych (5.1.2-java)
+    psych (5.2.0-java)
       jar-dependencies (>= 0.1.7)
-    public_suffix (6.0.0)
+    public_suffix (6.0.1)
     puma (6.4.3)
       nio4r (~> 2.0)
     puma (6.4.3-java)
@@ -326,23 +323,22 @@ GEM
       rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.0)
       rack (>= 3)
-      webrick (~> 1.8)
-    rails (7.1.5)
-      actioncable (= 7.1.5)
-      actionmailbox (= 7.1.5)
-      actionmailer (= 7.1.5)
-      actionpack (= 7.1.5)
-      actiontext (= 7.1.5)
-      actionview (= 7.1.5)
-      activejob (= 7.1.5)
-      activemodel (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
+    rails (8.0.0)
+      actioncable (= 8.0.0)
+      actionmailbox (= 8.0.0)
+      actionmailer (= 8.0.0)
+      actionpack (= 8.0.0)
+      actiontext (= 8.0.0)
+      actionview (= 8.0.0)
+      activejob (= 8.0.0)
+      activemodel (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
       bundler (>= 1.15.0)
-      railties (= 7.1.5)
+      railties (= 8.0.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -350,13 +346,13 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.9)
+    rails-i18n (8.0.1)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
-    railties (7.1.5)
-      actionpack (= 7.1.5)
-      activesupport (= 7.1.5)
-      irb
+      railties (>= 8.0.0, < 9)
+    railties (8.0.0)
+      actionpack (= 8.0.0)
+      activesupport (= 8.0.0)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -373,10 +369,10 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.10)
+    reline (0.5.11)
       io-console (~> 0.5)
     rexml (3.3.9)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -384,7 +380,7 @@ GEM
     rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.0.1)
+    rspec-rails (7.1.0)
       actionpack (>= 7.0)
       activesupport (>= 7.0)
       railties (>= 7.0)
@@ -403,7 +399,7 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.33.0)
+    rubocop-ast (1.34.1)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -435,23 +431,23 @@ GEM
     skylight (6.0.4)
       activesupport (>= 5.2.0)
     smart_properties (1.17.0)
-    sorbet (0.5.11631)
-      sorbet-static (= 0.5.11631)
-    sorbet-runtime (0.5.11631)
-    sorbet-static (0.5.11631-java)
-    sorbet-static (0.5.11631-universal-darwin)
-    sorbet-static (0.5.11631-x86_64-linux)
-    sorbet-static-and-runtime (0.5.11631)
-      sorbet (= 0.5.11631)
-      sorbet-runtime (= 0.5.11631)
+    sorbet (0.5.11645)
+      sorbet-static (= 0.5.11645)
+    sorbet-runtime (0.5.11645)
+    sorbet-static (0.5.11645-java)
+    sorbet-static (0.5.11645-universal-darwin)
+    sorbet-static (0.5.11645-x86_64-linux)
+    sorbet-static-and-runtime (0.5.11645)
+      sorbet (= 0.5.11645)
+      sorbet-runtime (= 0.5.11645)
     spoom (1.5.0)
       erubi (>= 1.10.0)
       prism (>= 0.28.0)
       sorbet-static-and-runtime (>= 0.5.10187)
       thor (>= 0.19.2)
     stackprof (0.2.26)
-    stringio (3.1.1)
-    tapioca (0.16.3)
+    stringio (3.1.2)
+    tapioca (0.16.4)
       bundler (>= 2.2.25)
       netrc (>= 0.11.0)
       parallel (>= 1.21.0)
@@ -467,13 +463,14 @@ GEM
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
     timecop (0.9.10)
-    timeout (0.4.1)
+    timeout (0.4.2)
     tomlrb (2.0.3)
-    traces (0.11.1)
+    traces (0.14.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
-    uri (0.13.0)
+    uri (1.0.1)
+    useragent (0.16.10)
     webrick (1.9.0)
     websocket (1.2.11)
     websocket-driver (0.7.6)
@@ -489,7 +486,7 @@ GEM
     yard-sorbet (0.9.0)
       sorbet-runtime
       yard
-    zeitwerk (2.6.18)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   arm64-darwin-22
diff --git a/bin/lint b/bin/lint
index a93f1126..7f4c8ead 100755
--- a/bin/lint
+++ b/bin/lint
@@ -46,15 +46,15 @@ FileUtils.chdir GEM_ROOT do
 
   puts "\n== ERB Lint =="
   if options[:nofix]
-    system!("bundle exec erblint app/views")
+    system!("bundle exec erb_lint app/views")
   else
     # Must run twice to run all linters
     # https://github.com/Shopify/erb-lint/issues/145
     puts "Running ERB Lint with autocorrectable linters"
-    system!("bundle exec erblint --autocorrect app/views")
+    system!("bundle exec erb_lint --autocorrect app/views")
 
     puts "\nRunning ERB Lint with all linters"
-    system!("bundle exec erblint app/views")
+    system!("bundle exec erb_lint app/views")
   end
 
   puts "\n== Markdown Lint =="