diff --git a/models/users/feedback.sql b/models/users/feedback.sql
index c371a629..4f50ef16 100644
--- a/models/users/feedback.sql
+++ b/models/users/feedback.sql
@@ -7,6 +7,7 @@
       {'columns': ['uuid'], 'type': 'hash'},
       {'columns': ['saved_timestamp']},
       {'columns': ['period_start']},
+      {'columns': ['user_name']},
     ]
   )
 }}
diff --git a/models/users/telemetry.sql b/models/users/telemetry.sql
index 09881f1c..cb61aa42 100644
--- a/models/users/telemetry.sql
+++ b/models/users/telemetry.sql
@@ -6,6 +6,9 @@
     indexes=[
       {'columns': ['uuid'], 'type': 'hash'},
       {'columns': ['saved_timestamp']},
+      {'columns': ['period_start']},
+      {'columns': ['user_name']},
+      {'columns': ['app_version']},
     ]
   )
 }}
diff --git a/models/users/telemetry_devices.sql b/models/users/telemetry_devices.sql
index 113ea6ba..4bad833d 100644
--- a/models/users/telemetry_devices.sql
+++ b/models/users/telemetry_devices.sql
@@ -6,6 +6,8 @@
     indexes=[
       {'columns': ['uuid'], 'type': 'hash'},
       {'columns': ['saved_timestamp']},
+      {'columns': ['period_start']},
+      {'columns': ['android_version']},
     ]
   )
 }}