Merge branch 'MLAB-611' into 'testing'

updated choose template image to reflect new templates

See merge request !138
1 job for testing in 12 seconds (queued for 5 seconds)