Fix env vars (cherry picked from commit 64d2ff03c80c807c03390f63ba1834c5605fc96d) # Conflicts: # .drone.yml