diff --git a/sentry-delayed_job/Gemfile b/sentry-delayed_job/Gemfile
index 43a0a85cf..4b016fde5 100644
--- a/sentry-delayed_job/Gemfile
+++ b/sentry-delayed_job/Gemfile
@@ -21,3 +21,4 @@ gem "sentry-ruby", path: "../sentry-ruby"
 gem "sentry-rails", path: "../sentry-rails"
 
 gem "pry"
+gem "debug", github: "ruby/debug" if RUBY_VERSION.to_f >= 2.6
diff --git a/sentry-delayed_job/example/Gemfile b/sentry-delayed_job/example/Gemfile
index b8760c53e..9f17926fd 100644
--- a/sentry-delayed_job/example/Gemfile
+++ b/sentry-delayed_job/example/Gemfile
@@ -8,3 +8,4 @@ gem "sentry-delayed_job", path: "../"
 gem "sentry-ruby", path: "../../sentry-ruby"
 
 gem "pry"
+gem "debug", github: "ruby/debug"
diff --git a/sentry-rails/examples/rails-6.0/Gemfile b/sentry-rails/examples/rails-6.0/Gemfile
index 116396757..6c51b9ee7 100644
--- a/sentry-rails/examples/rails-6.0/Gemfile
+++ b/sentry-rails/examples/rails-6.0/Gemfile
@@ -4,11 +4,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '> 2.6'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.0'
+gem 'rails', '~> 6.1.0'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '5.4.0'
 gem 'unicorn'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5'
@@ -31,8 +31,6 @@ gem 'sentry-rails', path: "../../"
 gem "resque"
 gem "sidekiq"
 
-gem 'pry'
-
 # Use Active Storage variant
 # gem 'image_processing', '~> 1.2'
 
@@ -40,22 +38,14 @@ gem 'pry'
 gem 'bootsnap', '>= 1.4.2', require: false
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  gem 'pry'
+  gem "debug", github: "ruby/debug"
 end
 
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
-  gem 'listen', '>= 3.0.5', '< 3.2'
-end
-
-group :test do
-  # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '>= 2.15'
-  gem 'selenium-webdriver'
-  # Easy installation and use of web drivers to run system tests with browsers
-  gem 'webdrivers'
+  gem 'listen'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/sentry-rails/examples/rails-6.0/app/controllers/welcome_controller.rb b/sentry-rails/examples/rails-6.0/app/controllers/welcome_controller.rb
index b16ddd4fe..ca3eb9410 100644
--- a/sentry-rails/examples/rails-6.0/app/controllers/welcome_controller.rb
+++ b/sentry-rails/examples/rails-6.0/app/controllers/welcome_controller.rb
@@ -6,7 +6,6 @@ def index
   end
 
   def connect_trace
-    transaction = Sentry.get_current_scope.get_transaction
     # see the sinatra example under the `sentry-ruby` folder
     response = Net::HTTP.get_response(URI("http://localhost:4567/connect_trace"))
 
diff --git a/sentry-resque/Gemfile b/sentry-resque/Gemfile
index 1b4e07f74..5677f7e65 100644
--- a/sentry-resque/Gemfile
+++ b/sentry-resque/Gemfile
@@ -13,3 +13,4 @@ gem "sentry-ruby", path: "../sentry-ruby"
 gem "sentry-rails", path: "../sentry-rails"
 
 gem "pry"
+gem "debug", github: "ruby/debug" if RUBY_VERSION.to_f >= 2.6
diff --git a/sentry-resque/example/Gemfile b/sentry-resque/example/Gemfile
index 5eef9cb54..51f1d4dfb 100644
--- a/sentry-resque/example/Gemfile
+++ b/sentry-resque/example/Gemfile
@@ -7,3 +7,4 @@ gem "sentry-resque", path: "../"
 gem "sentry-ruby", path: "../../sentry-ruby"
 
 gem "pry"
+gem "debug", github: "ruby/debug"
diff --git a/sentry-ruby/examples/sinatra/Gemfile b/sentry-ruby/examples/sinatra/Gemfile
index 16a716cc6..1b0dacb19 100644
--- a/sentry-ruby/examples/sinatra/Gemfile
+++ b/sentry-ruby/examples/sinatra/Gemfile
@@ -11,3 +11,4 @@ gem 'puma', '~> 3.11'
 gem 'sentry-ruby', path: "../../"
 
 gem 'pry'
+gem "debug", github: "ruby/debug"
diff --git a/sentry-ruby/examples/without_integrations/Gemfile b/sentry-ruby/examples/without_integrations/Gemfile
index 1e9ed7d4f..dd5d28d29 100644
--- a/sentry-ruby/examples/without_integrations/Gemfile
+++ b/sentry-ruby/examples/without_integrations/Gemfile
@@ -4,3 +4,4 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '> 2.6'
 
 gem 'sentry-ruby', path: "../../"
+gem "debug", github: "ruby/debug"
diff --git a/sentry-sidekiq/example/Gemfile b/sentry-sidekiq/example/Gemfile
index 2bb979176..50e387e1d 100644
--- a/sentry-sidekiq/example/Gemfile
+++ b/sentry-sidekiq/example/Gemfile
@@ -5,3 +5,4 @@ gem "sentry-sidekiq", path: "../"
 gem "sentry-ruby", path: "../../sentry-ruby"
 
 gem "pry"
+gem "debug", github: "ruby/debug"