diff --git a/puma_config.rb b/puma_config.rb
index 7d1bad15..5fb01d68 100644
--- a/puma_config.rb
+++ b/puma_config.rb
@@ -21,7 +21,7 @@ daemonize
 pidfile '/var/run/neocities/neocities.pid'
 stdout_redirect '/var/log/neocities/neocities.log', '/var/log/neocities/neocities-errors.log', true
 quiet
-workers 4
+workers processor_count
 worker_timeout 600
 preload_app!
 on_worker_boot { DB.disconnect }
diff --git a/rainbows_config.rb b/rainbows_config.rb
index 04b41fe6..e30fd79a 100644
--- a/rainbows_config.rb
+++ b/rainbows_config.rb
@@ -21,7 +21,7 @@ Rainbows! do
 
   client_max_body_size 100*1024*1024 # 100 Megabytes
 
-  worker_processes 4
+  worker_processes processor_count
   worker_connections 32
   timeout 600 # 10 minutes