FIX image types to be used by TCs
Merge branch 'QA/deploy_environment_regions' into jenkins