diff --git a/Gemfile b/Gemfile
index ca9df6a1..71986594 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,6 +29,7 @@ gem 'bugsnag'
 gem 'rack-cors', :require => 'rack/cors'
 gem 'rack-jsonp'
 gem 'http_accept_language'
+gem 'puma'
 
 # Upgraded to 1.0.0 for Rails 5.1.4
 gem 'activeadmin', '~> 1.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c3119e0..c063a32b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -256,6 +256,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.0)
+    puma (3.11.2)
     rack (2.0.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -418,6 +419,7 @@ DEPENDENCIES
   piwik_analytics (~> 1.0.2)
   poltergeist
   pry
+  puma
   rack-cors
   rack-jsonp
   rails (= 5.1.4)
diff --git a/Procfile b/Procfile
index b932a50f..c2c566e8 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: rails server -p $PORT
\ No newline at end of file
+web: bundle exec puma -C config/puma.rb
diff --git a/app.json b/app.json
index 105ac1c3..6911335f 100644
--- a/app.json
+++ b/app.json
@@ -14,18 +14,6 @@
     "EMAIL_PASSWORD": {
       "required": true
     },
-    "HEROKU_POSTGRESQL_AQUA_URL": {
-      "required": true
-    },
-    "HEROKU_POSTGRESQL_CYAN_URL": {
-      "required": true
-    },
-    "HEROKU_POSTGRESQL_NAVY_URL": {
-      "required": true
-    },
-    "HEROKU_POSTGRESQL_PURPLE_URL": {
-      "required": true
-    },
     "LANG": {
       "required": true
     },