Fix windows 21H1 pushing helper images and integration tests
What does this MR do?
A bit changed version of !3430 (merged)
Why was this MR needed?
What's the best way to test this MR?
What are the relevant issue numbers?
Edited by Georgi N. Georgiev