fix: allow using different base image with variables

Closed Wouter Deconinck requested to merge wdconinc-master-patch-19644 into master

Merge request reports