diff --git a/.github/workflows/ruby_ci.yml b/.github/workflows/ruby_ci.yml
index 479d81f4..14257ba2 100644
--- a/.github/workflows/ruby_ci.yml
+++ b/.github/workflows/ruby_ci.yml
@@ -15,7 +15,7 @@ jobs:
     services:
       mysql:
         # Use the Mysql docker image https://hub.docker.com/_/mysql
-        image: mysql:5.7 # Using 5.7 to map to what is used in production.
+        image: mysql:8.0
         ports:
          - 3306:3306 # Default port mappings
          # Monitor the health of the container to mesaure when it is ready
diff --git a/.release-version b/.release-version
index 40c341bd..7c69a55d 100644
--- a/.release-version
+++ b/.release-version
@@ -1 +1 @@
-3.6.0
+3.7.0
diff --git a/Gemfile b/Gemfile
index 0c9ccd17..00f80e61 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,8 +64,7 @@ group :test do
   gem 'launchy'
   gem 'rspec-collection_matchers'
   gem 'rspec-rails', '~> 3.5.0'
+  gem 'selenium-webdriver', require: false
   gem 'simplecov', require: false
   gem 'timecop'
-  # Keep webdriver in sync with chrome to prevent frustrating CI failures
-  gem 'webdrivers', require: false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c4975236..f4a94e01 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -137,12 +137,12 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.14.2)
+    nio4r (2.5.9)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
     pry (0.14.2)
       coderay (~> 1.1)
@@ -150,10 +150,10 @@ GEM
     psych (4.0.4)
       stringio
     public_suffix (5.0.1)
-    puma (6.1.1)
+    puma (6.3.0)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.6.3)
+    rack (2.2.6.4)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-test (2.0.2)
@@ -188,7 +188,7 @@ GEM
     rake (13.0.6)
     rdoc (6.4.0)
       psych (>= 4.0.0)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
@@ -209,21 +209,21 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (1.48.1)
+    rubocop (1.51.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.28.1)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.17.1)
       rubocop (~> 1.41)
-    rubocop-performance (1.16.0)
+    rubocop-performance (1.18.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.18.0)
@@ -283,10 +283,6 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.2.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
     websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
@@ -324,13 +320,13 @@ DEPENDENCIES
   rubocop-rspec
   sass-rails (~> 6.0)
   sdoc (~> 2.4.0)
+  selenium-webdriver
   simplecov
   spring
   timecop
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 4.0.4)
-  webdrivers
 
 BUNDLED WITH
    2.3.18
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 34db9b9d..ea500093 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -6,7 +6,7 @@
 require File.expand_path('../config/environment', __dir__)
 require 'rspec/rails'
 require 'spec_helper'
-require 'webdrivers/chromedriver'
+
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4ee177a5..87da827f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,8 +17,7 @@
 #
 # require 'database_cleaner'
 
-require 'webdrivers/chromedriver'
-Webdrivers::Chromedriver.update
+require 'selenium-webdriver'
 
 require 'factory_bot'
 require 'capybara/rspec'