Merge "Update CSIT to use Frankfurt images"