diff --git a/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml b/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
index 481129a1a..dffd81d01 100644
--- a/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
+++ b/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
@@ -11,12 +11,20 @@
     <property name="currentSponsorClientId" direction="asc"/>
     <property name="deletionTime" direction="asc"/>
   </datastore-index>
+  <datastore-index kind="DomainBase" ancestor="false" source="manual">
+    <property name="currentSponsorClientId" direction="asc"/>
+    <property name="deletionTime" direction="asc"/>
+  </datastore-index>
   <!-- For finding domain resources by TLD. -->
   <datastore-index kind="DomainBase" ancestor="false" source="manual">
     <property name="^i" direction="asc"/>
     <property name="tld" direction="asc"/>
     <property name="deletionTime" direction="asc"/>
   </datastore-index>
+  <datastore-index kind="DomainBase" ancestor="false" source="manual">
+    <property name="tld" direction="asc"/>
+    <property name="deletionTime" direction="asc"/>
+  </datastore-index>
   <!-- For finding domain resources by registrar. -->
   <datastore-index kind="DomainBase" ancestor="false" source="manual">
     <property name="currentSponsorClientId" direction="asc"/>
@@ -28,6 +36,10 @@
     <property name="tld" direction="asc"/>
     <property name="creationTime" direction="desc"/>
   </datastore-index>
+  <datastore-index kind="DomainBase" ancestor="false" source="manual">
+    <property name="tld" direction="asc"/>
+    <property name="creationTime" direction="desc"/>
+  </datastore-index>
   <!-- For finding host resources by registrar. -->
   <datastore-index kind="HostResource" ancestor="false" source="manual">
     <property name="currentSponsorClientId" direction="asc"/>
@@ -55,6 +67,10 @@
     <property name="nsHosts" direction="asc"/>
     <property name="deletionTime" direction="asc"/>
   </datastore-index>
+  <datastore-index kind="DomainBase" ancestor="false" source="manual">
+    <property name="nsHosts" direction="asc"/>
+    <property name="deletionTime" direction="asc"/>
+  </datastore-index>
   <!-- For WHOIS IP address lookup -->
   <datastore-index kind="HostResource" ancestor="false" source="manual">
     <property name="inetAddresses" direction="asc"/>
@@ -87,17 +103,30 @@
     <property name="currentSponsorClientId" direction="asc"/>
     <property name="fullyQualifiedDomainName" direction="asc"/>
   </datastore-index>
+  <datastore-index kind="DomainBase" ancestor="false" source="manual">
+    <property name="currentSponsorClientId" direction="asc"/>
+    <property name="fullyQualifiedDomainName" direction="asc"/>
+  </datastore-index>
   <datastore-index kind="DomainBase" ancestor="false" source="manual">
     <property name="^i" direction="asc"/>
     <property name="currentSponsorClientId" direction="asc"/>
     <property name="tld" direction="asc"/>
     <property name="fullyQualifiedDomainName" direction="asc"/>
   </datastore-index>
+  <datastore-index kind="DomainBase" ancestor="false" source="manual">
+    <property name="currentSponsorClientId" direction="asc"/>
+    <property name="tld" direction="asc"/>
+    <property name="fullyQualifiedDomainName" direction="asc"/>
+  </datastore-index>
   <datastore-index kind="DomainBase" ancestor="false" source="manual">
     <property name="^i" direction="asc"/>
     <property name="tld" direction="asc"/>
     <property name="fullyQualifiedDomainName" direction="asc"/>
   </datastore-index>
+  <datastore-index kind="DomainBase" ancestor="false" source="manual">
+    <property name="tld" direction="asc"/>
+    <property name="fullyQualifiedDomainName" direction="asc"/>
+  </datastore-index>
   <datastore-index kind="HostResource" ancestor="false" source="manual">
     <property name="deletionTime" direction="asc"/>
     <property name="fullyQualifiedHostName" direction="asc"/>