Merge "Fix API gateway image issue"