MAESTRO-3162 Images, take advantage of newer base
Note: Compatible with MaestroAgent > 2.0.2