Updates to AMI building and retrieveal of packages