diff --git a/Gemfile b/Gemfile
index d3e4293d500d0768be14982b41579ca5df4a57c0..768d28fa9b2ca6f54b6b54e3b2a5fec4225d4604 100644
--- a/Gemfile
+++ b/Gemfile
@@ -352,8 +352,9 @@ end
 group :development, :test do
   gem 'deprecation_toolkit', '~> 1.5.1', require: false
   gem 'bullet', '~> 6.1.0'
-  gem 'pry-byebug', '~> 3.9.0', platform: :mri
+  gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
   gem 'pry-rails', '~> 0.3.9'
+  gem 'pry-remote'
 
   gem 'awesome_print', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 9c0896891a7f88d0374e67d334d8b250483b98cf..a39a504e34ba9e995806a022bd83b68839ace060 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -445,6 +445,9 @@ GEM
     gitlab-markup (1.7.1)
     gitlab-net-dns (0.9.1)
     gitlab-pg_query (1.3.1)
+    gitlab-pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     gitlab-sidekiq-fetcher (0.5.2)
       sidekiq (~> 5)
     gitlab-styles (6.0.0)
@@ -864,11 +867,11 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
     public_suffix (4.0.6)
     puma (5.1.1)
       nio4r (~> 2.0)
@@ -1131,6 +1134,7 @@ GEM
     simplecov-html (0.12.2)
     sixarm_ruby_unaccent (1.2.0)
     slack-messenger (2.3.4)
+    slop (3.6.0)
     snowplow-tracker (0.6.1)
       contracts (~> 0.7, <= 0.11)
     spring (2.1.1)
@@ -1364,6 +1368,7 @@ DEPENDENCIES
   gitlab-mail_room (~> 0.0.8)
   gitlab-markup (~> 1.7.1)
   gitlab-net-dns (~> 0.9.1)
+  gitlab-pry-byebug
   gitlab-sidekiq-fetcher (= 0.5.2)
   gitlab-styles (~> 6.0.0)
   gitlab_chronic_duration (~> 0.10.6.2)
@@ -1455,8 +1460,8 @@ DEPENDENCIES
   png_quantizator (~> 0.2.1)
   premailer-rails (~> 1.10.3)
   prometheus-client-mmap (~> 0.12.0)
-  pry-byebug (~> 3.9.0)
   pry-rails (~> 0.3.9)
+  pry-remote
   puma (~> 5.1.1)
   puma_worker_killer (~> 0.3.1)
   rack (~> 2.2.3)