diff --git a/Gemfile b/Gemfile
index fb2eea6..e169fd3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ group :development, :test do
   gem "mina"
   gem 'guard-minitest'
   gem 'guard' # NOTE: this is necessary in newer versions
-  gem "puma" ,  "~> 4.0"
+  gem "puma"
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 74f40b0..d1204a6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -271,7 +271,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.1)
-    puma (4.3.12)
+    puma (6.0.2)
       nio4r (~> 2.0)
     pundit (2.3.0)
       activesupport (>= 3.0.0)
@@ -428,7 +428,7 @@ DEPENDENCIES
   mina
   passenger
   pg (~> 1.1)
-  puma (~> 4.0)
+  puma
   rails (~> 7.0)
   ruby2js!
   sassc-rails
diff --git a/bin/kill b/bin/kill
deleted file mode 100755
index a75baf6..0000000
--- a/bin/kill
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-kill -9 `cat tmp/pids/server.pid`
diff --git a/bin/staging b/bin/staging
deleted file mode 100755
index 6b5652e..0000000
--- a/bin/staging
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-exec ./bin/rails s -b 0.0.0.0 -p 3000 -d
diff --git a/config/puma.rb b/config/puma.rb
index daaf036..55fd299 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -13,10 +13,6 @@ threads min_threads_count, max_threads_count
 #
 worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
 
-# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
-#
-port ENV.fetch("PORT") { 3000 }
-
 # Specifies the `environment` that Puma will run in.
 #
 environment ENV.fetch("RAILS_ENV") { "development" }
@@ -24,6 +20,8 @@ environment ENV.fetch("RAILS_ENV") { "development" }
 # Specifies the `pidfile` that Puma will use.
 pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
 
+bind "tcp://0.0.0.0:3000"
+
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked web server processes. If using threads and workers together
 # the concurrency of the application would be max `threads` * `workers`.