Bug fixes to sync_controller_images.yaml