diff --git a/Gemfile b/Gemfile
index 3038e80..00ae1dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem 'rails-i18n', '~> 6.0'
 # Use mysql as the database for Active Record
 gem 'mysql2', '>= 0.4.4', '< 0.6.0'
 # Use Puma as the app server
-gem 'puma', '~> 5.0'
+gem 'puma', '< 6'
 
 gem 'devise', '~> 4.7'
 gem 'devise-i18n', '~> 1.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9869443..89f059a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -234,7 +234,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (5.6.2)
+    puma (4.3.11)
       nio4r (~> 2.0)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
@@ -412,7 +412,7 @@ DEPENDENCIES
   open4
   pry-byebug
   pry-rails
-  puma (~> 5.0)
+  puma (< 6)
   pundit (~> 1.1)
   rack-contrib
   rails (~> 6.1)
diff --git a/config/deploy/puma-chexpire@.service b/config/deploy/puma-chexpire@.service
index d7bc357..01f5763 100644
--- a/config/deploy/puma-chexpire@.service
+++ b/config/deploy/puma-chexpire@.service
@@ -3,14 +3,13 @@ Description=Puma Server for Chexpire (%i)
 After=network.target
 
 [Service]
-Type=forking
+Type=simple
 User=chexpire_%i
 EnvironmentFile=/home/chexpire_%i/www/current/.rbenv-vars
 Environment=RAILS_ENV=%i
 WorkingDirectory=/home/chexpire_%i/www/current/
-PIDFile=/home/chexpire_%i/www/shared/tmp/pids/puma.pid
 
-ExecStart=/home/chexpire_%i/.rbenv/bin/rbenv exec bundle exec puma -C /home/chexpire_%i/www/current/config/puma.rb --daemon
+ExecStart=/home/chexpire_%i/.rbenv/bin/rbenv exec bundle exec puma -C /home/chexpire_%i/www/current/config/puma.rb
 ExecStop=/home/chexpire_%i/.rbenv/bin/rbenv exec bundle exec pumactl -F /home/chexpire_%i/www/current/config/puma.rb stop
 ExecReload=/home/chexpire_%i/.rbenv/bin/rbenv exec bundle exec pumactl -F /home/chexpire_%i/www/current/config/puma.rb phased-restart