Improve expansion
Improve expansion

StefanScherer/dockerfiles-windows,StefanScherer/dockerfiles-windows,StefanScherer/dockerfiles-windows,StefanScherer/dockerfiles-windows,StefanScherer/dockerfiles-windows,StefanScherer/dockerfiles-windows,StefanScherer/dockerfiles-windows