diff --git a/Gemfile b/Gemfile
index ffde3d3e3..745e86a5d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -213,6 +213,7 @@ group :development, :test do
   gem 'bundle-audit', require: false
   gem 'byebug', platform: :mri
   gem 'climate_control'
+  gem 'debug', '~> 1.8'
   gem 'factory_bot_rails'
   gem 'listen'
   gem 'mock_redis'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6b52c1e67..b0e7cff57 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -184,6 +184,9 @@ GEM
       libddwaf (~> 1.8.2.0.0)
       msgpack
     debase-ruby_core_source (3.2.0)
+    debug (1.8.0)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
     declarative (0.0.20)
     devise (4.9.2)
       bcrypt (~> 3.0)
@@ -362,6 +365,9 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    io-console (0.6.0)
+    irb (1.7.2)
+      reline (>= 0.3.6)
     informers (0.2.0)
       blingfire (>= 0.1.7)
       numo-narray
@@ -593,6 +599,8 @@ GEM
     redis-namespace (1.10.0)
       redis (>= 4)
     regexp_parser (2.8.0)
+    reline (0.3.6)
+      io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -835,6 +843,7 @@ DEPENDENCIES
   cypress-on-rails
   database_cleaner
   ddtrace
+  debug (~> 1.8)
   devise
   devise-secure_password!
   devise_token_auth
diff --git a/Makefile b/Makefile
index 499d0ab6b..16eb80718 100644
--- a/Makefile
+++ b/Makefile
@@ -30,9 +30,23 @@ burn:
 	bundle && yarn
 
 run:
+	@if [ -f ./.overmind.sock ]; then \
+		echo "Overmind is already running. Use 'make force_run' to start a new instance."; \
+	else \
+		overmind start -f Procfile.dev; \
+	fi
+
+force_run:
+	rm -f ./.overmind.sock
 	overmind start -f Procfile.dev
 
+debug:
+	overmind connect backend
+
+debug_worker:
+	overmind connect worker
+
 docker: 
 	docker build -t $(APP_NAME) -f ./docker/Dockerfile .
 
-.PHONY: setup db_create db_migrate db_seed db console server burn docker run
+.PHONY: setup db_create db_migrate db_seed db console server burn docker run force_run debug debug_worker