Fix support for old CI API when image or services are not specified

Closes #35421

See merge request !13023