Merge "Chore: Clean up packer images"