diff --git a/Gemfile b/Gemfile
index c7899e9487b..8140918c632 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ group :test do
   gem "webrick"
 
   gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
-  gem "cucumber-rails", github: "cucumber/cucumber-rails", require: false
+  gem "cucumber-rails", require: false
   gem "cucumber"
   gem "database_cleaner"
   gem "jasmine"
diff --git a/Gemfile.lock b/Gemfile.lock
index e69fbf1ed40..3504b7bf987 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,16 +1,3 @@
-GIT
-  remote: https://github.com/cucumber/cucumber-rails.git
-  revision: 9d8f2e687d155a7da37e00d53504880b1b2ef9a8
-  specs:
-    cucumber-rails (2.4.0)
-      capybara (>= 2.18, < 4)
-      cucumber (>= 3.2, < 8)
-      mime-types (~> 3.3)
-      nokogiri (~> 1.10)
-      railties (>= 5.0, < 8)
-      rexml (~> 3.0)
-      webrick (~> 1.7)
-
 PATH
   remote: .
   specs:
@@ -149,6 +136,14 @@ GEM
     cucumber-html-formatter (17.0.0)
       cucumber-messages (~> 17.1, >= 17.1.0)
     cucumber-messages (17.1.1)
+    cucumber-rails (2.5.0)
+      capybara (>= 2.18, < 4)
+      cucumber (>= 3.2, < 8)
+      mime-types (~> 3.3)
+      nokogiri (~> 1.10)
+      railties (>= 5.0, < 8)
+      rexml (~> 3.0)
+      webrick (~> 1.7)
     cucumber-tag-expressions (4.1.0)
     cucumber-wire (6.2.0)
       cucumber-core (~> 10.1, >= 10.1.0)
@@ -489,7 +484,7 @@ DEPENDENCIES
   capybara
   chandler
   cucumber
-  cucumber-rails!
+  cucumber-rails
   cuprite
   database_cleaner
   devise
diff --git a/gemfiles/rails_60/Gemfile b/gemfiles/rails_60/Gemfile
index f6c1963de5b..2a36437b991 100644
--- a/gemfiles/rails_60/Gemfile
+++ b/gemfiles/rails_60/Gemfile
@@ -28,7 +28,7 @@ group :test do
   gem "webrick"
 
   gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
-  gem "cucumber-rails", github: "cucumber/cucumber-rails", require: false
+  gem "cucumber-rails", require: false
   gem "cucumber"
   gem "database_cleaner"
   gem "jasmine"
diff --git a/gemfiles/rails_60/Gemfile.lock b/gemfiles/rails_60/Gemfile.lock
index 6e6c2b38bf6..d367adb1396 100644
--- a/gemfiles/rails_60/Gemfile.lock
+++ b/gemfiles/rails_60/Gemfile.lock
@@ -1,16 +1,3 @@
-GIT
-  remote: https://github.com/cucumber/cucumber-rails.git
-  revision: 9d8f2e687d155a7da37e00d53504880b1b2ef9a8
-  specs:
-    cucumber-rails (2.4.0)
-      capybara (>= 2.18, < 4)
-      cucumber (>= 3.2, < 8)
-      mime-types (~> 3.3)
-      nokogiri (~> 1.10)
-      railties (>= 5.0, < 8)
-      rexml (~> 3.0)
-      webrick (~> 1.7)
-
 PATH
   remote: ../..
   specs:
@@ -140,6 +127,14 @@ GEM
     cucumber-html-formatter (17.0.0)
       cucumber-messages (~> 17.1, >= 17.1.0)
     cucumber-messages (17.1.1)
+    cucumber-rails (2.5.0)
+      capybara (>= 2.18, < 4)
+      cucumber (>= 3.2, < 8)
+      mime-types (~> 3.3)
+      nokogiri (~> 1.10)
+      railties (>= 5.0, < 8)
+      rexml (~> 3.0)
+      webrick (~> 1.7)
     cucumber-tag-expressions (4.1.0)
     cucumber-wire (6.2.0)
       cucumber-core (~> 10.1, >= 10.1.0)
@@ -390,7 +385,7 @@ DEPENDENCIES
   cancancan
   capybara
   cucumber
-  cucumber-rails!
+  cucumber-rails
   cuprite
   database_cleaner
   devise
diff --git a/gemfiles/rails_61_turbolinks/Gemfile b/gemfiles/rails_61_turbolinks/Gemfile
index 66482a78597..95621baa29e 100644
--- a/gemfiles/rails_61_turbolinks/Gemfile
+++ b/gemfiles/rails_61_turbolinks/Gemfile
@@ -30,7 +30,7 @@ group :test do
   gem "webrick"
 
   gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
-  gem "cucumber-rails", github: "cucumber/cucumber-rails", require: false
+  gem "cucumber-rails", require: false
   gem "cucumber"
   gem "database_cleaner"
   gem "jasmine"
diff --git a/gemfiles/rails_61_turbolinks/Gemfile.lock b/gemfiles/rails_61_turbolinks/Gemfile.lock
index e07df15c10a..b69b45e559e 100644
--- a/gemfiles/rails_61_turbolinks/Gemfile.lock
+++ b/gemfiles/rails_61_turbolinks/Gemfile.lock
@@ -1,16 +1,3 @@
-GIT
-  remote: https://github.com/cucumber/cucumber-rails.git
-  revision: 9d8f2e687d155a7da37e00d53504880b1b2ef9a8
-  specs:
-    cucumber-rails (2.4.0)
-      capybara (>= 2.18, < 4)
-      cucumber (>= 3.2, < 8)
-      mime-types (~> 3.3)
-      nokogiri (~> 1.10)
-      railties (>= 5.0, < 8)
-      rexml (~> 3.0)
-      webrick (~> 1.7)
-
 PATH
   remote: ../..
   specs:
@@ -144,6 +131,14 @@ GEM
     cucumber-html-formatter (17.0.0)
       cucumber-messages (~> 17.1, >= 17.1.0)
     cucumber-messages (17.1.1)
+    cucumber-rails (2.5.0)
+      capybara (>= 2.18, < 4)
+      cucumber (>= 3.2, < 8)
+      mime-types (~> 3.3)
+      nokogiri (~> 1.10)
+      railties (>= 5.0, < 8)
+      rexml (~> 3.0)
+      webrick (~> 1.7)
     cucumber-tag-expressions (4.1.0)
     cucumber-wire (6.2.0)
       cucumber-core (~> 10.1, >= 10.1.0)
@@ -395,7 +390,7 @@ DEPENDENCIES
   cancancan
   capybara
   cucumber
-  cucumber-rails!
+  cucumber-rails
   cuprite
   database_cleaner
   devise
diff --git a/gemfiles/rails_61_webpacker/Gemfile b/gemfiles/rails_61_webpacker/Gemfile
index 4a5c26e4166..c252a44ef29 100644
--- a/gemfiles/rails_61_webpacker/Gemfile
+++ b/gemfiles/rails_61_webpacker/Gemfile
@@ -27,7 +27,7 @@ group :test do
   gem "webrick"
 
   gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
-  gem "cucumber-rails", github: "cucumber/cucumber-rails", require: false
+  gem "cucumber-rails", require: false
   gem "cucumber"
   gem "database_cleaner"
   gem "jasmine"
diff --git a/gemfiles/rails_61_webpacker/Gemfile.lock b/gemfiles/rails_61_webpacker/Gemfile.lock
index 1e55fae890c..dafc54623ef 100644
--- a/gemfiles/rails_61_webpacker/Gemfile.lock
+++ b/gemfiles/rails_61_webpacker/Gemfile.lock
@@ -1,16 +1,3 @@
-GIT
-  remote: https://github.com/cucumber/cucumber-rails.git
-  revision: 9d8f2e687d155a7da37e00d53504880b1b2ef9a8
-  specs:
-    cucumber-rails (2.4.0)
-      capybara (>= 2.18, < 4)
-      cucumber (>= 3.2, < 8)
-      mime-types (~> 3.3)
-      nokogiri (~> 1.10)
-      railties (>= 5.0, < 8)
-      rexml (~> 3.0)
-      webrick (~> 1.7)
-
 PATH
   remote: ../..
   specs:
@@ -144,6 +131,14 @@ GEM
     cucumber-html-formatter (17.0.0)
       cucumber-messages (~> 17.1, >= 17.1.0)
     cucumber-messages (17.1.1)
+    cucumber-rails (2.5.0)
+      capybara (>= 2.18, < 4)
+      cucumber (>= 3.2, < 8)
+      mime-types (~> 3.3)
+      nokogiri (~> 1.10)
+      railties (>= 5.0, < 8)
+      rexml (~> 3.0)
+      webrick (~> 1.7)
     cucumber-tag-expressions (4.1.0)
     cucumber-wire (6.2.0)
       cucumber-core (~> 10.1, >= 10.1.0)
@@ -391,7 +386,7 @@ DEPENDENCIES
   cancancan
   capybara
   cucumber
-  cucumber-rails!
+  cucumber-rails
   cuprite
   database_cleaner
   devise