diff --git a/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml b/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
index 4c7953a88..34fabb1f7 100644
--- a/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
@@ -10,7 +10,7 @@
   <instance-class>B4</instance-class>
   <basic-scaling>
     <max-instances>4</max-instances>
-    <idle-timeout>10m</idle-timeout>
+    <idle-timeout>30m</idle-timeout>
   </basic-scaling>
 
   <system-properties>
diff --git a/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml b/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
index f5f277ff9..7ddffbd5d 100644
--- a/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
@@ -10,7 +10,7 @@
   <instance-class>B4_1G</instance-class>
   <basic-scaling>
     <max-instances>10</max-instances>
-    <idle-timeout>10m</idle-timeout>
+    <idle-timeout>30m</idle-timeout>
   </basic-scaling>
 
   <system-properties>
diff --git a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
index 1fc63c0a6..391b792e7 100644
--- a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
@@ -9,8 +9,8 @@
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
   <basic-scaling>
-    <max-instances>6</max-instances>
-    <idle-timeout>10m</idle-timeout>
+    <max-instances>8</max-instances>
+    <idle-timeout>30m</idle-timeout>
   </basic-scaling>
 
   <system-properties>
diff --git a/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
index 38351d263..db996fd89 100644
--- a/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
@@ -10,7 +10,7 @@
   <instance-class>B4</instance-class>
   <basic-scaling>
     <max-instances>4</max-instances>
-    <idle-timeout>10m</idle-timeout>
+    <idle-timeout>30m</idle-timeout>
   </basic-scaling>
 
   <system-properties>