diff --git a/util/migrate/migrategithubdeploykeys.py b/util/migrate/migrategithubdeploykeys.py
index 2d717f74e..ced41a85e 100644
--- a/util/migrate/migrategithubdeploykeys.py
+++ b/util/migrate/migrategithubdeploykeys.py
@@ -24,7 +24,8 @@ def backfill_github_deploykeys():
                               .select(RepositoryBuildTrigger.id)
                               .where(RepositoryBuildTrigger.private_key >> None)
                               .where(RepositoryBuildTrigger.service == github_service)
-                              .limit(10))
+                              .where(RepositoryBuildTrigger.used_legacy_github >> None)
+                              .limit(100))
 
     filtered_ids = [trigger.id for trigger in build_trigger_ids if trigger.id not in encountered]
     if len(filtered_ids) == 0:
@@ -39,15 +40,22 @@ def backfill_github_deploykeys():
 
       with app.config['DB_TRANSACTION_FACTORY'](db):
         try:
-          query = RepositoryBuildTrigger.select(RepositoryBuildTrigger.id == trigger_id)
+          query = RepositoryBuildTrigger.select().where(RepositoryBuildTrigger.id == trigger_id)
           trigger = db_for_update(query).get()
         except RepositoryBuildTrigger.DoesNotExist:
           logger.debug('Could not find build trigger %s', trigger_id)
           continue
 
+        trigger.used_legacy_github = True
+        trigger.save()
+
         handler = BuildTriggerHandler.get_handler(trigger)
 
         config = handler.config
+        if not 'build_source' in config:
+          logger.debug('Could not find build source for trigger %s', trigger_id)
+          continue
+
         build_source = config['build_source']
         gh_client = handler._get_client()
 
@@ -83,5 +91,8 @@ def backfill_github_deploykeys():
 
 
 if __name__ == "__main__":
+  logging.getLogger('boto').setLevel(logging.CRITICAL)
+  logging.getLogger('github').setLevel(logging.CRITICAL)
+
   logging.config.fileConfig('conf/logging_debug.conf', disable_existing_loggers=False)
   backfill_github_deploykeys()