diff --git a/Gemfile b/Gemfile
index 927c2162..baa6c5f7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem "bootsnap", require: false
 gem "pg"
 gem "puma"
 gem "rack-canonical-host"
-gem "rails", "~> 6.0.0.beta1"
+gem "rails", "~> 6.0.0.beta3"
 
 # Front-endy
 gem "autoprefixer-rails"
@@ -33,7 +33,7 @@ end
 
 group :development, :test do
   gem "factory_bot_rails"
-  gem "rspec-rails"
+  gem "rspec-rails" # , github: "rspec/rspec-rails" # https://github.com/rspec/rspec-rails/pull/2089
   gem "rspec_junit_formatter"
   gem "rubocop", require: false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index d5ca85f5..107c80ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,59 +1,60 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.0.beta1)
-      actionpack (= 6.0.0.beta1)
+    actioncable (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.0.beta1)
-      actionpack (= 6.0.0.beta1)
-      activejob (= 6.0.0.beta1)
-      activerecord (= 6.0.0.beta1)
-      activestorage (= 6.0.0.beta1)
-      activesupport (= 6.0.0.beta1)
+    actionmailbox (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      activejob (= 6.0.0.beta3)
+      activerecord (= 6.0.0.beta3)
+      activestorage (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
       mail (>= 2.7.1)
-    actionmailer (6.0.0.beta1)
-      actionpack (= 6.0.0.beta1)
-      actionview (= 6.0.0.beta1)
-      activejob (= 6.0.0.beta1)
+    actionmailer (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      actionview (= 6.0.0.beta3)
+      activejob (= 6.0.0.beta3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.0.beta1)
-      actionview (= 6.0.0.beta1)
-      activesupport (= 6.0.0.beta1)
+    actionpack (6.0.0.beta3)
+      actionview (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actiontext (6.0.0.beta1)
-      actionpack (= 6.0.0.beta1)
-      activerecord (= 6.0.0.beta1)
-      activestorage (= 6.0.0.beta1)
-      activesupport (= 6.0.0.beta1)
+    actiontext (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      activerecord (= 6.0.0.beta3)
+      activestorage (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
       nokogiri (>= 1.8.5)
-    actionview (6.0.0.beta1)
-      activesupport (= 6.0.0.beta1)
+    actionview (6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (6.0.0.beta1)
-      activesupport (= 6.0.0.beta1)
+    activejob (6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
       globalid (>= 0.3.6)
-    activemodel (6.0.0.beta1)
-      activesupport (= 6.0.0.beta1)
-    activerecord (6.0.0.beta1)
-      activemodel (= 6.0.0.beta1)
-      activesupport (= 6.0.0.beta1)
-    activestorage (6.0.0.beta1)
-      actionpack (= 6.0.0.beta1)
-      activerecord (= 6.0.0.beta1)
+    activemodel (6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+    activerecord (6.0.0.beta3)
+      activemodel (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+    activestorage (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      activerecord (= 6.0.0.beta3)
       marcel (~> 0.3.1)
-    activesupport (6.0.0.beta1)
+    activesupport (6.0.0.beta3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 1.3, >= 1.3.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     annotate (2.7.4)
@@ -165,29 +166,29 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-timeout (0.5.1)
-    rails (6.0.0.beta1)
-      actioncable (= 6.0.0.beta1)
-      actionmailbox (= 6.0.0.beta1)
-      actionmailer (= 6.0.0.beta1)
-      actionpack (= 6.0.0.beta1)
-      actiontext (= 6.0.0.beta1)
-      actionview (= 6.0.0.beta1)
-      activejob (= 6.0.0.beta1)
-      activemodel (= 6.0.0.beta1)
-      activerecord (= 6.0.0.beta1)
-      activestorage (= 6.0.0.beta1)
-      activesupport (= 6.0.0.beta1)
+    rails (6.0.0.beta3)
+      actioncable (= 6.0.0.beta3)
+      actionmailbox (= 6.0.0.beta3)
+      actionmailer (= 6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      actiontext (= 6.0.0.beta3)
+      actionview (= 6.0.0.beta3)
+      activejob (= 6.0.0.beta3)
+      activemodel (= 6.0.0.beta3)
+      activerecord (= 6.0.0.beta3)
+      activestorage (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
       bundler (>= 1.3.0)
-      railties (= 6.0.0.beta1)
+      railties (= 6.0.0.beta3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (6.0.0.beta1)
-      actionpack (= 6.0.0.beta1)
-      activesupport (= 6.0.0.beta1)
+    railties (6.0.0.beta3)
+      actionpack (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -294,6 +295,7 @@ GEM
     websocket-extensions (0.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    zeitwerk (1.3.3)
 
 PLATFORMS
   ruby
@@ -318,7 +320,7 @@ DEPENDENCIES
   puma
   rack-canonical-host
   rack-timeout
-  rails (~> 6.0.0.beta1)
+  rails (~> 6.0.0.beta3)
   rspec-rails
   rspec_junit_formatter
   rubocop