diff --git a/.env.template b/.env.template
index 9f55f84..dca7b9c 100644
--- a/.env.template
+++ b/.env.template
@@ -11,3 +11,7 @@ APP_ENV=
 # Add configuration values here, as shown below.
 HERE8_APIKEY=
 SENTRY_DSN=http://public:secret@example.com/project-id
+
+# Default values from : https://puma.io/puma/Puma/Configuration.html
+PUMA_WORKERS=0
+PUMA_THREADS=0:5
diff --git a/docker-compose.yml b/docker-compose.yml
index 1e1d72c..2bf76d0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
       APP_ENV: ${APP_ENV:-development}
       HERE8_APIKEY: ${HERE8_APIKEY:-}
       SENTRY_DSN: ${SENTRY_DSN:-}
-    command: bundle exec puma -v -p 80 --pidfile 'tmp/server.pid'
+    command: bundle exec puma -v -p 80 --pidfile 'tmp/server.pid' -t "${PUMA_THREADS:-0:5}" -w "${PUMA_WORKERS:-0}"
     restart: unless-stopped
 
   router-demo-build:
diff --git a/router-demo b/router-demo
index 9e01328..89b5546 160000
--- a/router-demo
+++ b/router-demo
@@ -1 +1 @@
-Subproject commit 9e01328f6ff2359b391c770a3cd9cca6b7a7d9eb
+Subproject commit 89b5546aef5a4eddca790ed72ac77211121710d1