Add env vars if secret is provided
What does this MR do?
This MR reverts a change introduces in %17.3. Tags were not more used.
Why was this MR needed?
To unblock broken setups
What's the best way to test this MR?
NA
What are the relevant issue numbers?
close #555 (closed)