diff --git a/config/puma.rb b/config/puma.rb
index 8d09b00ac..489ae0779 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -25,7 +25,7 @@ if !Rails.env.local?
   # worker per CPU, 1 thread per worker and tune it from there.
   #
   # https://edgeguides.rubyonrails.org/tuning_performance_for_deployment.html#puma
-  workers Concurrent.physical_processor_count
+  workers Integer(ENV.fetch("WEB_CONCURRENCY") { Concurrent.physical_processor_count })
   threads 1, 1
 
   # Tell the Ruby VM that we're finished booting up.
diff --git a/config/queue.yml b/config/queue.yml
index 130b0d9bd..3f5615fa8 100644
--- a/config/queue.yml
+++ b/config/queue.yml
@@ -5,7 +5,7 @@ default: &default
   workers:
     - queues: [ "default", "solid_queue_recurring", "backend", "webhooks" ]
       threads: 3
-      processes: <%= ENV.fetch("JOB_CONCURRENCY", Concurrent.physical_processor_count) %>
+      processes: <%= Integer(ENV.fetch("JOB_CONCURRENCY") { Concurrent.physical_processor_count }) %>
       polling_interval: 0.1
 
 development: *default