diff --git a/.github/app.template.yaml b/.github/app.template.yaml
index 619ba4cc5..f91124440 100644
--- a/.github/app.template.yaml
+++ b/.github/app.template.yaml
@@ -8,6 +8,7 @@ inbound_services:
 automatic_scaling:
   min_instances: ${MIN_INSTANCES}
   max_instances: ${MAX_INSTANCES}
+  max_concurrent_requests: 6
 handlers:
   - url: /.*
     secure: always
diff --git a/.github/workflows/CD_production.yml b/.github/workflows/CD_production.yml
index e135876e1..ef5cf101a 100644
--- a/.github/workflows/CD_production.yml
+++ b/.github/workflows/CD_production.yml
@@ -120,8 +120,8 @@ jobs:
         run: |
           export MAX_INSTANCES="10"
           export SERVICE_NAME="ocotillo-api"
-          export ENTRYPOINT="gunicorn -w 4 -k uvicorn.workers.UvicornWorker main:app"
-          export MIN_INSTANCES="0"
+          export ENTRYPOINT="gunicorn -w 8 -k uvicorn.workers.UvicornWorker main:app"
+          export MIN_INSTANCES="1"
           envsubst < .github/app.template.yaml > app.yaml
 
       - name: Deploy to Google Cloud