--- a/contrib/automation/hgautomation/aws.py	Wed May 01 15:34:03 2019 -0700
+++ b/contrib/automation/hgautomation/aws.py	Fri Apr 19 05:07:44 2019 -0700
@@ -490,7 +490,7 @@
 
     terminate_ec2_instances(ec2resource, prefix=prefix)
 
-    for image in ec2resource.images.all():
+    for image in ec2resource.images.filter(Owners=['self']):
         if image.name.startswith(prefix):
             remove_ami(ec2resource, image)