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 ef28324b7..3cd46adeb 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
@@ -8,9 +8,10 @@
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
-  <manual-scaling>
-    <instances>30</instances>
-  </manual-scaling>
+  <basic-scaling>
+    <max-instances>100</max-instances>
+    <idle-timeout>30m</idle-timeout>
+  </basic-scaling>
 
   <system-properties>
     <property name="java.util.logging.config.file"
diff --git a/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml b/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
index 5a6ea5c8e..fadebf02d 100644
--- a/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
@@ -8,9 +8,10 @@
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
-  <manual-scaling>
-    <instances>20</instances>
-  </manual-scaling>
+  <basic-scaling>
+    <max-instances>100</max-instances>
+    <idle-timeout>30m</idle-timeout>
+  </basic-scaling>
 
   <system-properties>
     <property name="java.util.logging.config.file"
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 c5ed1090a..d380fce49 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
@@ -8,9 +8,10 @@
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
-  <manual-scaling>
-    <instances>30</instances>
-  </manual-scaling>
+  <basic-scaling>
+    <max-instances>100</max-instances>
+    <idle-timeout>30m</idle-timeout>
+  </basic-scaling>
 
   <system-properties>
     <property name="java.util.logging.config.file"
diff --git a/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
index cde9e57a8..93bd121a3 100644
--- a/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
@@ -8,9 +8,10 @@
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
-  <manual-scaling>
-    <instances>20</instances>
-  </manual-scaling>
+  <basic-scaling>
+    <max-instances>100</max-instances>
+    <idle-timeout>30m</idle-timeout>
+  </basic-scaling>
 
   <system-properties>
     <property name="java.util.logging.config.file"